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 cc990ffa8..b4a05af0c 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
@@ -754,6 +754,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 {
@@ -1283,6 +1286,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 7ff88afcc..66e1389f6 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
@@ -635,6 +635,7 @@ class MessageModel
         if (textContent != null) {
             computeTextContent(textContent, highlight)
         }
+        isSelected.postValue(highlight.isNotEmpty())
     }
 
     @WorkerThread