diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
index 125806442..95abdcdee 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
@@ -790,6 +790,9 @@ open class ConversationFragment : SlidingPaneChildFragment() {
         viewModel.focusSearchBarEvent.observe(viewLifecycleOwner) {
             it.consume { show ->
                 if (show) {
+                    val bottomSheetBehavior = BottomSheetBehavior.from(binding.messageBottomSheet.root)
+                    bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
+
                     // To automatically open keyboard
                     binding.search.showKeyboard()
                 } else {
@@ -1346,6 +1349,7 @@ open class ConversationFragment : SlidingPaneChildFragment() {
         showDelivery: Boolean = false,
         showReactions: Boolean = false
     ) {
+        viewModel.closeSearchBar()
         binding.sendArea.messageToSend.hideKeyboard()
         backPressedCallback.isEnabled = true
 
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
index a8319a2bf..cb61500fe 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
@@ -647,6 +647,7 @@ class MessageModel
         if (textContent != null) {
             computeTextContent(textContent, highlight)
         }
+        isSelected.postValue(highlight.isNotEmpty())
     }
 
     @WorkerThread