diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3cd0a016..13373e13 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -26,7 +26,7 @@ android {
         applicationId = "dev.yashgarg.qbit"
         minSdk = 24
         targetSdk = 33
-        versionCode = 6
+        versionCode = 7
         versionName = "v0.1.$versionCode-$commitHash"
 
         multiDexEnabled = true
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 69c7ac1c..9fcb9fcb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,6 +26,7 @@
 
         <activity
             android:name=".MainActivity"
+            android:configChanges="orientation|screenSize"
             android:exported="true"
             android:theme="@style/Theme.Qbit">
             <intent-filter>
diff --git a/app/src/main/kotlin/dev/yashgarg/qbit/MainActivity.kt b/app/src/main/kotlin/dev/yashgarg/qbit/MainActivity.kt
index d2afd731..85b3f4dd 100644
--- a/app/src/main/kotlin/dev/yashgarg/qbit/MainActivity.kt
+++ b/app/src/main/kotlin/dev/yashgarg/qbit/MainActivity.kt
@@ -1,7 +1,6 @@
 package dev.yashgarg.qbit
 
 import android.content.Context
-import android.content.pm.ActivityInfo
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
@@ -13,7 +12,7 @@ import androidx.core.os.bundleOf
 import androidx.core.view.WindowCompat
 import androidx.datastore.core.DataStore
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.whenStarted
+import androidx.lifecycle.whenResumed
 import androidx.navigation.Navigation.findNavController
 import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequestBuilder
@@ -39,7 +38,6 @@ class MainActivity : AppCompatActivity() {
     @Inject lateinit var serverPrefsStore: DataStore<ServerPreferences>
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
         WindowCompat.setDecorFitsSystemWindows(window, false)
         super.onCreate(savedInstanceState)
 
@@ -48,14 +46,12 @@ class MainActivity : AppCompatActivity() {
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        Log.i(this.javaClass.simpleName, "SavedInstanceState: $savedInstanceState")
-
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             checkPermissions(applicationContext)
         }
 
         lifecycleScope.launch {
-            whenStarted {
+            whenResumed {
                 clientManager.configStatus.collect { status ->
                     when (status) {
                         ConfigStatus.EXISTS -> {