Index: branches/unlabeled/unlabeled-1.39.8/core/kernel/event_manager.php
===================================================================
diff -u -r6862 -r6863
--- branches/unlabeled/unlabeled-1.39.8/core/kernel/event_manager.php	(.../event_manager.php)	(revision 6862)
+++ branches/unlabeled/unlabeled-1.39.8/core/kernel/event_manager.php	(.../event_manager.php)	(revision 6863)
@@ -337,15 +337,15 @@
 					array_pop($opener_stack);
 					break;
 
-				case 'p': //pop-up - do not store last template
+				case 'p': // pop-up - generate new wid
 					$parent_wid = $this->Application->GetVar('m_wid'); // window_id of popup's parent window
 					$popup_wid = (int)$this->Application->RecallVar('last_wid') + 1;
 					$this->Application->StoreVar('last_wid', $popup_wid);
 					$this->Application->SetVar('m_wid', $popup_wid);
+					
 					$opener_stack = Array ( $this->Application->RecallVar(rtrim('last_template_popup_'.$parent_wid, '_')) );
 					$this->Application->SetVar('m_opener', 's');
 					$wid = $popup_wid;
-//					$this->Application->SetVar('skip_last_template', 1);
 					break;
 
 				default:	// "s/0," stay on same deep level