diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 2c590d3c..edcb8242 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -201,7 +201,7 @@ const EmojiPicker = {
           sortedEmojiGroups.get(emoji.tags[0]).push(emoji)
         }
       })
-      return sortedEmojiGroups
+      return new Map([...sortedEmojiGroups.entries()].sort())
     },
     emojisView () {
       if (this.keyword === '') {