diff --git a/ui/shared/status/StatusEmojiPopup.qml b/ui/shared/status/StatusEmojiPopup.qml
index a683aedd8b..9d684d4b20 100644
--- a/ui/shared/status/StatusEmojiPopup.qml
+++ b/ui/shared/status/StatusEmojiPopup.qml
@@ -10,7 +10,7 @@ import "./emojiList.js" as EmojiJSON
 Popup {
     property var emojiSelected: function () {}
     property var categories: []
-    property string searchString: searchBox.text
+    property alias searchString: searchBox.text
 
     id: popup
     modal: false
@@ -89,17 +89,21 @@ Popup {
         categories = newCategories
     }
     Connections {
+        id: connectionSettings
         target: applicationWindow
         onSettingsLoaded: {
+            connectionSettings.enabled = false
             // Add recent
             if (!appSettings.recentEmojis || !appSettings.recentEmojis.length) {
                 return
             }
+            categories[0] = appSettings.recentEmojis
             emojiSectionsRepeater.itemAt(0).allEmojis = appSettings.recentEmojis
         }
     }
 
     onOpened: {
+        searchBox.text = ""
         searchBox.forceActiveFocus(Qt.MouseFocusReason)
     }
 
diff --git a/ui/shared/status/StatusEmojiSection.qml b/ui/shared/status/StatusEmojiSection.qml
index 329caf87e5..473e9570cc 100644
--- a/ui/shared/status/StatusEmojiSection.qml
+++ b/ui/shared/status/StatusEmojiSection.qml
@@ -43,10 +43,13 @@ Item {
 
     onSearchStringLowercaseChanged: {
         if (emojiSection.searchStringLowercase === "") {
-            this.emojis = modelData
+            this.emojis = allEmojis
             return
         }
         this.emojis = modelData.filter(function (emoji) {
+            if (emoji.empty) {
+                return false
+            }
             return emoji.name.includes(emojiSection.searchStringLowercase) ||
                     emoji.shortname.includes(emojiSection.searchStringLowercase) ||
                     emoji.aliases.some(a => a.includes(emojiSection.searchStringLowercase))