diff --git a/app/src/main/java/org/linphone/activities/main/MainActivity.kt b/app/src/main/java/org/linphone/activities/main/MainActivity.kt
index b955f86a1..47d4ec8b3 100644
--- a/app/src/main/java/org/linphone/activities/main/MainActivity.kt
+++ b/app/src/main/java/org/linphone/activities/main/MainActivity.kt
@@ -226,7 +226,7 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
         destination: NavDestination,
         arguments: Bundle?
     ) {
-        currentFocus?.hideKeyboard()
+        hideKeyboard()
         if (statusFragment.visibility == View.GONE) {
             statusFragment.visibility = View.VISIBLE
         }
@@ -239,11 +239,15 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
         updateTabsFragmentVisibility()
     }
 
+    fun hideKeyboard() {
+        currentFocus?.hideKeyboard()
+    }
+
     private fun updateTabsFragmentVisibility() {
         tabsFragment.visibility = if (tabsFragmentVisible1 && tabsFragmentVisible2) View.VISIBLE else View.GONE
     }
 
-    private fun View.hideKeyboard() {
+    fun View.hideKeyboard() {
         val imm = context.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
         imm.hideSoftInputFromWindow(windowToken, 0)
     }
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 410c310e5..175012fc0 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
@@ -125,6 +125,7 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
             viewLifecycleOwner,
             {
                 it.consume {
+                    (requireActivity() as MainActivity).hideKeyboard()
                     if (!binding.slidingPane.closePane()) {
                         goBack()
                     }