diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue
index 661d340863..064a362bff 100644
--- a/src/client/app/common/views/components/autocomplete.vue
+++ b/src/client/app/common/views/components/autocomplete.vue
@@ -216,7 +216,11 @@ export default Vue.extend({
 				}
 			} else if (this.type == 'emoji') {
 				if (this.q == null || this.q == '') {
-					this.emojis = this.emojiDb.filter(x => x.isCustomEmoji && !x.aliasOf);
+					this.emojis = this.emojiDb.filter(x => x.isCustomEmoji && !x.aliasOf).sort((a, b) => {
+						var textA = a.name.toUpperCase();
+						var textB = b.name.toUpperCase();
+						return (textA < textB) ? -1 : (textA > textB) ? 1 : 0;
+					});
 					return;
 				}