Index: branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php
===================================================================
diff -u -r6863 -r6865
--- branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php	(.../application.php)	(revision 6863)
+++ branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php	(.../application.php)	(revision 6865)
@@ -1088,6 +1088,12 @@
 					array_pop($opener_stack);
 					if (!$opener_stack) {
 						$this->RemoveVar($stack_name);
+						// remove popups last templates, because popup is closing now
+						$this->RemoveVar('last_template_'.$wid);
+						$this->RemoveVar('last_template_popup_'.$wid);
+						
+						// don't save popups last templates again :)
+						$this->SetVar('skip_last_template', 1);
 					}
 					else {
 						$this->StoreVar($stack_name, serialize($opener_stack));