diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index c8fffd14b..c1918c3d7 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -889,6 +889,8 @@ class processMap
 
     public function getStepTriggersCriteria($sStepUID = '', $sTaskUID = '', $sType = '')
     {
+        $imgEx = "<div><img src='/images/hasCondition.png' height='16' width='16'></div>";
+        $imgNoEx = '<div></div>';
         $sDelimiter = DBAdapter::getStringDelimiter();
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn('C.CON_VALUE');
@@ -896,6 +898,7 @@ class processMap
         $oCriteria->addSelectColumn('TRI_UID');
         $oCriteria->addAsColumn('TRI_LOCATE_WEBBOT_PARAM', '(SELECT LOCATE(MD5(' . TriggersPeer::TRI_WEBBOT . '),' . TriggersPeer::TRI_PARAM . ') FROM ' . TriggersPeer::TABLE_NAME . ' WHERE ' . TriggersPeer::TRI_UID . '=' . StepTriggerPeer::TRI_UID . ' )');
         $oCriteria->addSelectColumn('ST_TYPE');
+        $oCriteria->addSelectColumn('IF ('.StepTriggerPeer::ST_CONDITION.' = "", "'.$imgNoEx.'", "'.$imgEx.'") AS CONDITION_SET');
         $oCriteria->addSelectColumn(StepTriggerPeer::ST_POSITION);
         $oCriteria->addAsColumn('TRI_TITLE', 'C.CON_VALUE');
         $oCriteria->addAlias('C', 'CONTENT');
diff --git a/workflow/engine/xmlform/steps/triggersAfter_List.xml b/workflow/engine/xmlform/steps/triggersAfter_List.xml
index a3ddd9bfd..485efae46 100755
--- a/workflow/engine/xmlform/steps/triggersAfter_List.xml
+++ b/workflow/engine/xmlform/steps/triggersAfter_List.xml
@@ -10,6 +10,7 @@
   <triggersEdit type="hidden" defaultValue="../triggers/triggers_Edit"/>
   <EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="triggerEdit(@QTRI_UID,@QTRI_LOCATE_WEBBOT_PARAM); return false;"/>
   <CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, 'AFTER');return false;"/>
+  <CONDITION_SET type="text" enablehtml="1" align="left" colWidth=""/>
   <UP type="link" colWidth="" value="@G::LoadTranslation(ID_UP)" link="#" onclick="upTrigger(@QSTEP_UID, @QTRI_UID, 'AFTER', @QST_POSITION);return false;"/>
   <DOWN type="link" colWidth="" value="@G::LoadTranslation(ID_DOWN)" link="#" onclick="downTrigger(@QSTEP_UID, @QTRI_UID, 'AFTER', @QST_POSITION);return false;"/>
   <DELETE type="link" colWidth="" value="@G::LoadTranslation(ID_DE_ASSIGN)" link="#" onclick="ofToAssignTrigger(@QSTEP_UID, @QTRI_UID, 'AFTER', @QST_POSITION);return false;">
diff --git a/workflow/engine/xmlform/steps/triggersBefore_List.xml b/workflow/engine/xmlform/steps/triggersBefore_List.xml
index 1f127d172..625c8f934 100755
--- a/workflow/engine/xmlform/steps/triggersBefore_List.xml
+++ b/workflow/engine/xmlform/steps/triggersBefore_List.xml
@@ -10,6 +10,7 @@
   <triggersEdit type="hidden" defaultValue="../triggers/triggers_Edit"/>
   <EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="triggerEdit(@QTRI_UID,@QTRI_LOCATE_WEBBOT_PARAM); return false;"/>
   <CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, 'BEFORE');return false;"/>
+  <CONDITION_SET type="text" enablehtml="1" align="left" colWidth=""/>
   <UP type="link" colWidth="" value="@G::LoadTranslation(ID_UP)" link="#" onclick="upTrigger(@QSTEP_UID, @QTRI_UID, 'BEFORE', @QST_POSITION);return false;"/>
   <DOWN type="link" colWidth="" value="@G::LoadTranslation(ID_DOWN)" link="#" onclick="downTrigger(@QSTEP_UID, @QTRI_UID, 'BEFORE', @QST_POSITION);return false;"/>
   <DELETE type="link" colWidth="" value="@G::LoadTranslation(ID_DE_ASSIGN)" link="#" onclick="ofToAssignTrigger(@QSTEP_UID, @QTRI_UID, 'BEFORE', @QST_POSITION);return false;">
diff --git a/workflow/engine/xmlform/steps/triggersCondition_Edit.xml b/workflow/engine/xmlform/steps/triggersCondition_Edit.xml
index 38498378a..a1e78ee33 100755
--- a/workflow/engine/xmlform/steps/triggersCondition_Edit.xml
+++ b/workflow/engine/xmlform/steps/triggersCondition_Edit.xml
@@ -68,7 +68,9 @@ var insertFormVar = function(sFieldName, sValue) {
 function saveTriggerCondition(oForm)
 {
   ajax_post(oForm.action, oForm, 'POST');
+  var sType = document.getElementById('form[ST_TYPE]').value;
   currentPopupWindow.remove();
+  showTriggers('@#STEP_UID', sType);
 }
 
 ]]></JS>
diff --git a/workflow/public_html/images/hasCondition.png b/workflow/public_html/images/hasCondition.png
new file mode 100644
index 000000000..5ad7922ac
Binary files /dev/null and b/workflow/public_html/images/hasCondition.png differ