diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index c9a59871af..61c66ec426 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -1144,7 +1144,7 @@ class ConversationFragment :
   }
 
   private fun invalidateOptionsMenu() {
-    if (searchMenuItem?.isActionViewExpanded != true) {
+    if (searchMenuItem?.isActionViewExpanded != true || !isSearchRequested) {
       binding.toolbar.invalidateMenu()
     }
   }