diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt
index c135de94..71b640c9 100644
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt
@@ -138,7 +138,10 @@ fun LobstersApp(
       topBar = {
         ClawAppBar(
           navigationIcon = {
-            if (navItems.none { it.route == currentDestination }) {
+            if (
+              navController.previousBackStackEntry != null &&
+                navItems.none { it.route == currentDestination }
+            ) {
               IconButton(
                 onClick = { if (!navController.popBackStack()) context.getActivity()?.finish() }
               ) {