diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationViewModel.kt
index 8d7d826310..cdbde08bf2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationViewModel.kt
@@ -382,13 +382,5 @@ class MainNavigationViewModel(
       }
       return result
     }
-
-    override suspend fun seekBack(backNavigationBehavior: BackNavigationBehavior, fraction: Float) {
-      super.seekBack(backNavigationBehavior, fraction)
-
-      if (fraction == 0f) {
-        lockPaneToSecondary = true
-      }
-    }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffoldNavigator.kt b/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffoldNavigator.kt
index b1f14b3d7c..0c75554dd5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffoldNavigator.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffoldNavigator.kt
@@ -58,6 +58,10 @@ open class AppScaffoldNavigator<T> @RememberInComposition constructor(private va
   }
 
   override suspend fun seekBack(backNavigationBehavior: BackNavigationBehavior, fraction: Float) {
+    if (fraction == 0f && state == NavigationState.SEEK) {
+      state = NavigationState.ENTER
+    }
+
     if (fraction > 0f && state != NavigationState.SEEK) {
       state = NavigationState.SEEK
     }