Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/close_popup.tpl
===================================================================
diff -u -r6866 -r6892
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/close_popup.tpl	(.../close_popup.tpl)	(revision 6866)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/close_popup.tpl	(.../close_popup.tpl)	(revision 6892)
@@ -3,7 +3,7 @@
 		<title></title>
 		<script type="text/javascript">
 			var $is_debug = <inp2:m_if check="m_ConstOn" name="DBG_REDIRECT">true<inp2:m_else/>false</inp2:m_if>;
-			var $popup_stay = <inp2:m_if check="m_GetEquals" name="popup_stay" value="1">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"/>';
 			
 			if ($is_debug) {
@@ -15,14 +15,14 @@
 			
 			function proceed_redirect() {
 				
-				if (window.opener && !$popup_stay) {
-					// using popups & close_popup called
+				if (window.opener) {
+					// using popups & close_popup called (from anywhere)
 					window.opener.location.href = $redirect_url.replace('%5C', '\\');
 					window.close();
 					window.opener.focus();
 				}
-				else {
-					// not using popups, but close_popup called
+				else if (!$use_popups) {
+					// not using popups (for editing), but close_popup called (e.g. from selector)
 					window.location.href = $redirect_url.replace('%5C', '\\');
 				}
 			}