Index: branches/RC/core/admin_templates/incs/close_popup.tpl
===================================================================
diff -u -N -r11665 -r11931
--- branches/RC/core/admin_templates/incs/close_popup.tpl	(.../close_popup.tpl)	(revision 11665)
+++ branches/RC/core/admin_templates/incs/close_popup.tpl	(.../close_popup.tpl)	(revision 11931)
@@ -7,6 +7,7 @@
 			var $is_debug = <inp2:m_if check="m_ConstOn" name="DBG_REDIRECT">true<inp2:m_else/>false</inp2:m_if>;
 			var $use_popups = <inp2:m_if check="adm_UsePopups">true<inp2:m_else/>false</inp2:m_if>;
 			var $redirect_url = '<inp2:m_t t="dummy" opener="u" m_opener="u" escape="escape"/>';
+			var $modal_windows = <inp2:m_if check="m_GetConfig" name="UseModalWindows">true<inp2:m_else/>false</inp2:m_if>;
 
 			if ($is_debug) {
 				document.write('<a href="#" onclick="proceed_redirect()">' + $redirect_url.replace('%5C', '\\') + '</a>');
@@ -98,8 +99,19 @@
 				return $main_window.parent;
 			}
 
+			// copied locally, because won't work, when called via getFrame('main').window_close(...);
 			function window_close($close_callback) {
 				// use this instead of "window.close();"
+				if (!$modal_windows) {
+					if (getFrame('main').$.isFunction($close_callback)) {
+						// use close callback, because iframe will be removed later in this method
+						$close_callback();
+					}
+
+					window.close();
+					return ;
+				}
+
 				if (window.name == 'main') {
 					return ;
 				}