Index: trunk/core/admin_templates/js/script.js
===================================================================
diff -u -N -r8061 -r8082
--- trunk/core/admin_templates/js/script.js	(.../script.js)	(revision 8061)
+++ trunk/core/admin_templates/js/script.js	(.../script.js)	(revision 8082)
@@ -13,7 +13,7 @@
 	var submitted = false;
 	var $edit_mode = false;
 	var $init_made = true; // in case of double inclusion of script.js :)
-
+	
 	// hook processing
 	var hBEFORE	= 1; // this is const, but including this twice causes errors
 	var hAFTER	= 2; // this is const, but including this twice causes errors
@@ -442,7 +442,6 @@
 	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
-	set_hidden_field($prefix_special+'_mode', mode_bak)
 }
 
 function openSelector($prefix, $url, $dst_field, $window_size, $event)
@@ -505,6 +504,7 @@
 		opener_action('d');
 	  	submit_event(prefix_special,'OnPreCreate', edit_template);
   	}
+  set_hidden_field(prefix_special+'_mode', '');
 }
 
 function std_new_item(prefix_special, edit_template)
@@ -518,10 +518,8 @@
 	}
 }
 
-var mode_bak = null;
 function std_edit_item(prefix_special, edit_template)
 {
-	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);
@@ -530,6 +528,7 @@
 		opener_action('d');
 		submit_event(prefix_special,'OnEdit',edit_template);
 	}
+	set_hidden_field(prefix_special+'_mode', '');
 }
 
 function std_edit_temp_item(prefix_special, edit_template)