Index: branches/unlabeled/unlabeled-1.57.2/core/kernel/session/session.php
===================================================================
diff -u -r8235 -r8301
--- branches/unlabeled/unlabeled-1.57.2/core/kernel/session/session.php	(.../session.php)	(revision 8235)
+++ branches/unlabeled/unlabeled-1.57.2/core/kernel/session/session.php	(.../session.php)	(revision 8301)
@@ -810,8 +810,19 @@
 		// save last_template in persistant session
 		if (!$wid) {
 			if ($this->Application->IsAdmin()) {
-				// only for main window, not popups, not login template (used in adm:MainFrameLink tag)
-				$this->StorePersistentVar('last_template_popup', $last_template);
+				// only for main window, not popups, not login template, not temp mode (used in adm:MainFrameLink tag)
+				$temp_mode = false;
+				$passed = explode(',', $this->Application->GetVar('passed'));
+				foreach ($passed as $passed_prefix) {
+					if ($this->Application->GetVar($passed_prefix.'_mode')) {
+						$temp_mode = true;
+						break;
+					}
+				}
+				
+				if (!$temp_mode) {
+					$this->StorePersistentVar('last_template_popup', $last_template);
+				}
 			}
 			elseif ($this->Application->GetVar('admin') == 1) {
 				$admin_session =& $this->Application->recallObject('Session.admin');