diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
index 413870796c..cc0bac6ac3 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -30449,7 +30449,7 @@ public void openSearchWithText(String text) {
             updateBottomOverlay();
         }
         if ((threadMessageId == 0 || isTopic || chatMode == MODE_SAVED) && !UserObject.isReplyUser(currentUser)) {
-            openSearchKeyboard = text == null;
+            openSearchKeyboard = text == null || text.isEmpty();
             if (searchItem != null) {
                 searchItem.openSearch(openSearchKeyboard);
             }