Index: admin_templates/shipping/shipping_zones.tpl
===================================================================
--- admin_templates/shipping/shipping_zones.tpl	(revision 13010)
+++ admin_templates/shipping/shipping_zones.tpl	(working copy)
@@ -40,8 +40,16 @@
 
 				function edit()
 	  			{
-  					opener_action('d');
-						submit_event('z', 'OnLoadZoneForm', 'in-commerce/shipping/zone_edit')
+	  				// TODO: make OnLoadZoneForm as hook to OnStoreSelected, when such event will be available
+	  				// std_edit_temp_item('z', 'in-commerce/shipping/zone_edit');
+	  				
+	  				if (use_popups('z', 'OnLoadZoneForm')) {
+						open_popup('z', 'OnLoadZoneForm', 'in-commerce/shipping/zone_edit');
+					}
+					else {
+						opener_action('d');
+						submit_event('z', 'OnLoadZoneForm', 'in-commerce/shipping/zone_edit');
+					}
 	  			}
 
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );