diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue
index 1aea2f1cb..b66da49d7 100644
--- a/src/client/app/common/views/components/autocomplete.vue
+++ b/src/client/app/common/views/components/autocomplete.vue
@@ -19,7 +19,7 @@
 			<span class="emoji" v-if="emoji.isCustomEmoji"><img :src="emoji.url" :alt="emoji.emoji"/></span>
 			<span class="emoji" v-else-if="!useOsDefaultEmojis"><img :src="emoji.url" :alt="emoji.emoji"/></span>
 			<span class="emoji" v-else>{{ emoji.emoji }}</span>
-			<span class="name">{{ beforeQ }}<b>{{ q }}</b>{{ afterQ }}</span>
+			<span class="name" v-html="emoji.name.replace(q, `<b>${q}</b>`)"></span>
 			<span class="alias" v-if="emoji.aliasOf">({{ emoji.aliasOf }})</span>
 		</li>
 	</ol>
@@ -89,14 +89,6 @@ export default Vue.extend({
 	},
 
 	computed: {
-		beforeQ(): string {
-			return this.emoji.name.split(this.q)[0];
-		},
-
-		afterQ(): string {
-			return this.emoji.name.split(this.q)[1] || '';
-		},
-
 		items(): HTMLCollection {
 			return (this.$refs.suggests as Element).children;
 		},