Index: branches/RC/core/units/configuration/configuration_event_handler.php
===================================================================
diff -u -N -r10832 -r10838
--- branches/RC/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 10832)
+++ branches/RC/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 10838)
@@ -154,6 +154,10 @@
 				$this->Application->removeObject($event->getPrefixSpecial());
 				$event->redirect = false;
 			}
+
+			// keeps module and section in REQUEST to ensure, that last admin template will work
+			$event->SetRedirectParam('module', $this->Application->GetVar('module'));
+			$event->SetRedirectParam('section', $this->Application->GetVar('section'));
 		}
 
 		/**
@@ -187,7 +191,8 @@
 		{
 			$selected_ids = $this->Application->GetVar('selected_ids');
 			$this->Application->StoreVar('ModuleRootCategory', $selected_ids['c']);
-			$this->finalizePopup($event);
+
+			$event->SetRedirectParam('opener', 'u');
 		}
 
 	}