diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
index 94cf60f51e..43cfa702f3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
@@ -542,7 +542,9 @@ class ConversationSettingsFragment :
                   .build()
 
                 startActivity(intent)
-                requireActivity().finish()
+                if (requireActivity() !is MainNavigationChatDetailRouter) {
+                  requireActivity().finish()
+                }
               }
           }
         )
@@ -812,7 +814,9 @@ class ConversationSettingsFragment :
                 recipient = group,
                 onRowClick = {
                   CommunicationActions.startConversation(requireActivity(), group, null)
-                  requireActivity().finish()
+                  if (requireActivity() !is MainNavigationChatDetailRouter) {
+                    requireActivity().finish()
+                  }
                 }
               )
             )