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 5bdff0a369..9c1bd4f5b7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationViewModel.kt
@@ -319,6 +319,14 @@ class MainNavigationViewModel(
    * piece of content via [goTo].
    */
   private inner class Nav<T>(delegate: ThreePaneScaffoldNavigator<T>) : AppScaffoldNavigator<T>(delegate) {
+    override suspend fun navigateBack(backNavigationBehavior: BackNavigationBehavior): Boolean {
+      val result = super.navigateBack(backNavigationBehavior)
+      if (result) {
+        lockPaneToSecondary = true
+      }
+      return result
+    }
+
     override suspend fun seekBack(backNavigationBehavior: BackNavigationBehavior, fraction: Float) {
       super.seekBack(backNavigationBehavior, fraction)