diff --git a/workflow/engine/xmlform/steps/triggersAfter_Options.xml b/workflow/engine/xmlform/steps/triggersAfter_Options.xml
index 930742b36..4fb33c027 100755
--- a/workflow/engine/xmlform/steps/triggersAfter_Options.xml
+++ b/workflow/engine/xmlform/steps/triggersAfter_Options.xml
@@ -13,9 +13,16 @@
 
 <JS type="javascript" replaceTags="1" showInTable="1">
 <![CDATA[
+var windowCode = new Array();
 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();
+        if ( !windowCode[sTRI_UID] ) {
+            var windowOpen = 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));
+            windowOpen.focus();
+            windowCode[sTRI_UID]=windowOpen;
+        } else {
+            windowCode[sTRI_UID].focus();
+        }
     } else {
         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 be74d6499..e2f043d96 100755
--- a/workflow/engine/xmlform/steps/triggersBefore_Options.xml
+++ b/workflow/engine/xmlform/steps/triggersBefore_Options.xml
@@ -12,9 +12,16 @@
 <PAGED_TABLE_ID type="private"/>
 <JS type="javascript" replaceTags="1">
 <![CDATA[
+var windowCode = new Array();
 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();
+        if ( !windowCode[sTRI_UID] ) {
+            var windowOpen = 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));
+            windowOpen.focus();
+            windowCode[sTRI_UID]=windowOpen;
+        } else {
+            windowCode[sTRI_UID].focus();
+        }
     } else {
         popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sTRI_UID + '&STEP_UID=' + '@#STEP' + '&ST_TYPE=BEFORE', 930, 600);
     }
diff --git a/workflow/engine/xmlform/triggers/triggers_Edit.xml b/workflow/engine/xmlform/triggers/triggers_Edit.xml
index 15d3d4640..09544183c 100755
--- a/workflow/engine/xmlform/triggers/triggers_Edit.xml
+++ b/workflow/engine/xmlform/triggers/triggers_Edit.xml
@@ -84,8 +84,16 @@ var insertFormVar = function(sFieldName, sValue) {
 };
 
 function cancel(){
+    if(opener) {
+        opener.windowCode[document.getElementById('form[TRI_UID]').value] = false;
+    }
     window.close();
 }
+window.onbeforeunload=function(){
+    if(opener) {
+        opener.windowCode[document.getElementById('form[TRI_UID]').value] = false;
+    }
+};
 
 function triggerSave1(form){
     ajax_post(form.action, form, 'POST');
diff --git a/workflow/engine/xmlform/triggers/triggers_Options.xml b/workflow/engine/xmlform/triggers/triggers_Options.xml
index b3b077472..3adab43c3 100755
--- a/workflow/engine/xmlform/triggers/triggers_Options.xml
+++ b/workflow/engine/xmlform/triggers/triggers_Options.xml
@@ -71,9 +71,16 @@
     }
   }
 
+  var windowCode = new Array();
   function triggerEdit( sUID, modified) {
     if(parseInt(modified) == 0){
-        window.open('@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID,'@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)+sUID,'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();
+        if ( !windowCode[sUID] ) {
+            var windowOpen = window.open('@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID,'@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)+sUID,'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));
+            windowOpen.focus();
+            windowCode[sUID]=windowOpen;
+        } else {
+            windowCode[sUID].focus();
+        }
     } else {
         popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID, 930, 600);
     }