diff --git a/src/main/kotlin/com/looker/droidify/ui/activities/MainActivityX.kt b/src/main/kotlin/com/looker/droidify/ui/activities/MainActivityX.kt
index 940a7a19..f3140911 100644
--- a/src/main/kotlin/com/looker/droidify/ui/activities/MainActivityX.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/activities/MainActivityX.kt
@@ -81,13 +81,14 @@ class MainActivityX : AppCompatActivity() {
             handleIntent(intent)
         }
         setContentView(binding.root)
+    }
 
+    override fun onStart() {
+        super.onStart()
         setSupportActionBar(toolbar)
-
         if (Android.sdk(28) && !Android.Device.isHuaweiEmui) {
             toolbar.menu.setGroupDividerEnabled(true)
         }
-
         toolbar.isFocusableInTouchMode = true
         binding.collapsingToolbar.title = getString(R.string.application_name)
 
@@ -104,10 +105,6 @@ class MainActivityX : AppCompatActivity() {
         supportFragmentManager.addFragmentOnAttachListener { _, _ ->
             hideKeyboard()
         }
-    }
-
-    override fun onStart() {
-        super.onStart()
         syncConnection.bind(this)
     }
 
diff --git a/src/main/kotlin/com/looker/droidify/ui/activities/PrefsActivityX.kt b/src/main/kotlin/com/looker/droidify/ui/activities/PrefsActivityX.kt
index 2e646246..a549208f 100644
--- a/src/main/kotlin/com/looker/droidify/ui/activities/PrefsActivityX.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/activities/PrefsActivityX.kt
@@ -73,9 +73,11 @@ class PrefsActivityX : AppCompatActivity() {
             handleIntent(intent)
         }
         setContentView(binding.root)
+    }
 
+    override fun onStart() {
+        super.onStart()
         setSupportActionBar(toolbar)
-
         toolbar.isFocusableInTouchMode = true
         binding.collapsingToolbar.title = getString(R.string.settings)
 
@@ -92,10 +94,6 @@ class PrefsActivityX : AppCompatActivity() {
         supportFragmentManager.addFragmentOnAttachListener { _, _ ->
             hideKeyboard()
         }
-    }
-
-    override fun onStart() {
-        super.onStart()
         syncConnection.bind(this)
     }