diff --git a/src/qml/EmojiDialog.qml b/src/qml/EmojiDialog.qml
index 72821b374..c85fad4d3 100644
--- a/src/qml/EmojiDialog.qml
+++ b/src/qml/EmojiDialog.qml
@@ -31,6 +31,7 @@ QQC2.Popup {
 
     onVisibleChanged: {
         if (!visible) {
+            emojiPicker.clearSearchField()
             return
         }
         emojiPicker.forceActiveFocus()
diff --git a/src/qml/EmojiPicker.qml b/src/qml/EmojiPicker.qml
index 86676975e..ac6c18e89 100644
--- a/src/qml/EmojiPicker.qml
+++ b/src/qml/EmojiPicker.qml
@@ -206,4 +206,8 @@ ColumnLayout {
             onClicked: stickerModel.packIndex = model.index
         }
     }
+
+    function clearSearchField() {
+        searchField.text = ""
+    }
 }