Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js
===================================================================
diff -u -r7099 -r7102
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js	(.../script.js)	(revision 7099)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js	(.../script.js)	(revision 7102)
@@ -437,8 +437,10 @@
 	$kf.target = $window_name;
 
 	var $prev_opener = opener_action('p');
+	event_bak = get_hidden_field('events[' + $prefix_special + ']')
 	submit_event($prefix_special, $event, $t);
 	opener_action($prev_opener); // restore opener in parent window
+	set_hidden_field('events[' + $prefix_special + ']', event_bak); // restore event
 }
 
 function openSelector($prefix, $url, $dst_field, $window_size, $event)
@@ -511,6 +513,7 @@
 
 function std_edit_item(prefix_special, edit_template)
 {
+	var mode_bak = get_hidden_field(prefix_special+'_mode');
 	set_hidden_field(prefix_special+'_mode', 't');
 	if (use_popups(prefix_special, 'OnEdit')) {
 		open_popup(prefix_special, 'OnEdit', edit_template);
@@ -519,6 +522,7 @@
 		opener_action('d');
 		submit_event(prefix_special,'OnEdit',edit_template);
 	}
+	set_hidden_field(prefix_special+'_mode', mode_bak)
 }
 
 function std_edit_temp_item(prefix_special, edit_template)