diff --git a/src/App.php b/src/App.php
index e7381ab125..d70adf27fd 100644
--- a/src/App.php
+++ b/src/App.php
@@ -889,6 +889,9 @@ class App
 				$this->internalRedirect('search');
 			}
 
+			// Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid
+			$this->page['page_title'] = $moduleName;
+
 			// determine the module class and save it to the module instance
 			// @todo there's an implicit dependency due SESSION::start(), so it has to be called here (yet)
 			$module = $module->determineClass($this->args, $router, $this->config);
diff --git a/src/App/Page.php b/src/App/Page.php
index 1fb927b463..5298a66cbd 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -356,9 +356,6 @@ class Page implements ArrayAccess
 	{
 		$moduleName = $module->getName();
 
-		// Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid
-		$this->page['page_title'] = $moduleName;
-
 		/* Create the page content.
 		 * Calls all hooks which are including content operations
 		 *
@@ -455,7 +452,7 @@ class Page implements ArrayAccess
 		}
 
 		// Theme templates expect $a as an App instance
-		$a = $this;
+		$a = $app;
 
 		// Used as is in view/php/default.php
 		$lang = $l10n->getCurrentLang();