diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index 328e5868d..c3af5be00 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -221,17 +221,6 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
 
         val container: ViewGroup = binding.controllerContainer
         router = Conductor.attachRouter(this, container, savedInstanceState)
-        if (!router.hasRootController()) {
-            // Set start screen
-            if (!handleIntentAction(intent)) {
-                setSelectedNavItem(startScreenId)
-            }
-        }
-
-        binding.toolbar.setNavigationOnClickListener {
-            onBackPressed()
-        }
-
         router.addChangeListener(
             object : ControllerChangeHandler.ControllerChangeListener {
                 override fun onChangeStarted(
@@ -254,6 +243,17 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
                 }
             }
         )
+        if (!router.hasRootController()) {
+            // Set start screen
+            if (!handleIntentAction(intent)) {
+                setSelectedNavItem(startScreenId)
+            }
+        }
+        syncActivityViewWithController()
+
+        binding.toolbar.setNavigationOnClickListener {
+            onBackPressed()
+        }
 
         if (savedInstanceState == null) {
             // Reset Incognito Mode on relaunch
@@ -391,7 +391,6 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
     override fun onResume() {
         super.onResume()
         checkForUpdates()
-        syncActivityViewWithController()
     }
 
     private fun checkForUpdates() {