diff --git a/src/functions/emoji/emoji.js b/src/functions/emoji/emoji.js
index b464e58b92..28fbd42209 100644
--- a/src/functions/emoji/emoji.js
+++ b/src/functions/emoji/emoji.js
@@ -33,7 +33,10 @@ import { EmojiIndex, frequently } from 'emoji-mart-vue-fast'
 export const emojiSearch = function(query, maxResults = 10) {
 	const index = new EmojiIndex(data)
 	if (query) {
-		return index.search(query, maxResults) || []
+		var results = index.search(`:${query}`, maxResults).map(e => e.native)
+		if (results.length < maxResults) {
+			results = results.concat(index.search(query, maxResults - results.length).map(e => e.native))
+		return results
 	}
 
 	return frequently.get(maxResults).map((id) => index.emoji(id)) || []