diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
index bf7626a5a..67d28bf17 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
@@ -252,8 +252,16 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
                         Log.w("[Chat] Activity is pending destruction, don't start navigating now!")
                         sharedViewModel.destructionPendingChatRoom = chatRoom
                     } else {
-                        sharedViewModel.selectedChatRoom.value = chatRoom
-                        navigateToChatRoom(AppUtils.createBundleWithSharedTextAndFiles(sharedViewModel))
+                        if (chatRoom.peerAddress.asStringUriOnly() == coreContext.notificationsManager.currentlyDisplayedChatRoomAddress) {
+                            Log.w("[Chat] This chat room is already displayed!")
+                        } else {
+                            sharedViewModel.selectedChatRoom.value = chatRoom
+                            navigateToChatRoom(
+                                AppUtils.createBundleWithSharedTextAndFiles(
+                                    sharedViewModel
+                                )
+                            )
+                        }
                     }
                 }
             }
diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
index a42c3f7b3..5d35899a3 100644
--- a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
@@ -219,7 +219,6 @@ class MasterContactsFragment : MasterFragment<ContactMasterFragmentBinding, Cont
                 it.consume { contact ->
                     Log.i("[Contacts] Selected item in list changed: $contact")
                     sharedViewModel.selectedContact.value = contact
-                    listViewModel.filter.value = ""
 
                     if (editOnClick) {
                         navigateToContactEditor(sipUriToAdd, binding.slidingPane)