Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/header.tpl
===================================================================
diff -u -r6734 -r6866
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 6734)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 6866)
@@ -31,6 +31,9 @@
 var $base_path = '<inp2:m_GetConst name="BASE_PATH"/>';
 var img_path = '<inp2:m_TemplatesBase module="#MODULE#"/>/img/';
 
+<inp2:m_if check="m_GetEquals" name="m_wid" value="" inverse="inverse">
+	window.name += '_<inp2:m_get name="m_wid"/>';
+</inp2:m_if>
 </script>
 </head>
 
Index: branches/unlabeled/unlabeled-1.9.2/kernel/units/relationship/relationship_event_handler.php
===================================================================
diff -u -r6864 -r6866
--- branches/unlabeled/unlabeled-1.9.2/kernel/units/relationship/relationship_event_handler.php	(.../relationship_event_handler.php)	(revision 6864)
+++ branches/unlabeled/unlabeled-1.9.2/kernel/units/relationship/relationship_event_handler.php	(.../relationship_event_handler.php)	(revision 6866)
@@ -85,6 +85,8 @@
 					
 					$redirect_params = Array($event->Prefix.'_event' => 'OnNew', 'target_id' => $target_id, 'm_opener' => 's', 'target_type' => $target_type);
 					$this->Application->EventManager->openerStackPush($template, $redirect_params, 'all,'.$event->Prefix);
+					
+//					$event->SetRedirectParam('popup_stay', 1); // if popup mode, then set this
 				}
 			}
 			else {
Index: branches/unlabeled/unlabeled-1.9.2/core/units/relationship/relationship_event_handler.php
===================================================================
diff -u -r6864 -r6866
--- branches/unlabeled/unlabeled-1.9.2/core/units/relationship/relationship_event_handler.php	(.../relationship_event_handler.php)	(revision 6864)
+++ branches/unlabeled/unlabeled-1.9.2/core/units/relationship/relationship_event_handler.php	(.../relationship_event_handler.php)	(revision 6866)
@@ -85,6 +85,8 @@
 					
 					$redirect_params = Array($event->Prefix.'_event' => 'OnNew', 'target_id' => $target_id, 'm_opener' => 's', 'target_type' => $target_type);
 					$this->Application->EventManager->openerStackPush($template, $redirect_params, 'all,'.$event->Prefix);
+					
+//					$event->SetRedirectParam('popup_stay', 1); // if popup mode, then set this
 				}
 			}
 			else {
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/close_popup.tpl
===================================================================
diff -u -r6864 -r6866
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/close_popup.tpl	(.../close_popup.tpl)	(revision 6864)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/close_popup.tpl	(.../close_popup.tpl)	(revision 6866)
@@ -3,6 +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 $redirect_url = '<inp2:m_t t="dummy" opener="u" m_opener="u" escape="escape"/>';
 			
 			if ($is_debug) {
@@ -13,7 +14,8 @@
 			}
 			
 			function proceed_redirect() {
-				if (window.opener) {
+				
+				if (window.opener && !$popup_stay) {
 					// using popups & close_popup called
 					window.opener.location.href = $redirect_url.replace('%5C', '\\');
 					window.close();