diff --git a/workflow/engine/xmlform/steps/triggersAfter_Options.xml b/workflow/engine/xmlform/steps/triggersAfter_Options.xml
index 1c55e73b2..930742b36 100755
--- a/workflow/engine/xmlform/steps/triggersAfter_Options.xml
+++ b/workflow/engine/xmlform/steps/triggersAfter_Options.xml
@@ -17,7 +17,7 @@ function triggerEdit(sTRI_UID,modified){
     if(parseInt(modified) == 0){
         window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + sTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_')+(function(s){var r='';for(var i in s)if(typeof s[i]=='string')r+=s[i].charCodeAt(0);return r;})(document.cookie)+sTRI_UID,'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=950,height=570,top='+((screen.height-570)/2)+',left='+((screen.width-950)/2)).focus();
     } else {
-        popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sTRI_UID + '&STEP_UID=' + @#STEP + '&ST_TYPE=AFTER', 930, 600);
+        popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sTRI_UID + '&STEP_UID=' + '@#STEP' + '&ST_TYPE=AFTER', 930, 600);
     }
 }
 ]]>
diff --git a/workflow/engine/xmlform/steps/triggersBefore_Options.xml b/workflow/engine/xmlform/steps/triggersBefore_Options.xml
index 2c761883e..be74d6499 100755
--- a/workflow/engine/xmlform/steps/triggersBefore_Options.xml
+++ b/workflow/engine/xmlform/steps/triggersBefore_Options.xml
@@ -16,7 +16,7 @@ function triggerEdit(sTRI_UID,modified){
     if(parseInt(modified) == 0){
         window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + sTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_')+(function(s){var r='';for(var i in s)if(typeof s[i]=='string')r+=s[i].charCodeAt(0);return r;})(document.cookie)+sTRI_UID,'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=950,height=570,top='+((screen.height-570)/2)+',left='+((screen.width-950)/2)).focus();
     } else {
-        popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sTRI_UID + '&STEP_UID=' + @#STEP + '&ST_TYPE=BEFORE', 930, 600);
+        popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sTRI_UID + '&STEP_UID=' + '@#STEP' + '&ST_TYPE=BEFORE', 930, 600);
     }
 }
 ]]>