diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f94fa76..3776a58 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = "org.soulstone.overwatch"
         minSdk = 26
         targetSdk = 35
-        versionCode = 7
-        versionName = "0.1.6"
+        versionCode = 8
+        versionName = "0.1.7"
     }
 
     buildTypes {
diff --git a/app/src/main/kotlin/org/soulstone/overwatch/MainActivity.kt b/app/src/main/kotlin/org/soulstone/overwatch/MainActivity.kt
index 8acf20b..ec40ffa 100644
--- a/app/src/main/kotlin/org/soulstone/overwatch/MainActivity.kt
+++ b/app/src/main/kotlin/org/soulstone/overwatch/MainActivity.kt
@@ -9,6 +9,7 @@ import android.os.Build
 import android.os.Bundle
 import android.provider.Settings as AndroidSettings
 import androidx.activity.ComponentActivity
+import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.collectAsState
@@ -115,6 +116,10 @@ class MainActivity : ComponentActivity() {
                         )
                     }
                     Screen.SETTINGS -> {
+                        // Route system back into MAIN instead of letting the
+                        // activity finish — the screen enum is internal to
+                        // Compose and the OS doesn't know about it.
+                        BackHandler { screen = Screen.MAIN }
                         val running by DetectionService.running.collectAsState()
                         SettingsScreen(
                             settings = settings,