diff --git a/extensions/emoji/js/forum/dist/extension.js b/extensions/emoji/js/forum/dist/extension.js
index de0045cbb..b5a1ad921 100644
--- a/extensions/emoji/js/forum/dist/extension.js
+++ b/extensions/emoji/js/forum/dist/extension.js
@@ -176,14 +176,17 @@ System.register('flarum/emoji/addComposerAutocomplete', ['flarum/extend', 'flaru
 
         if (this.selectionEnd - cursor > 0) return;
 
-        // Search backwards from the cursor for an ':' symbol, without any
-        // intervening whitespace. If we find one, we will want to show the
+        // Search backwards from the cursor for an ':' symbol. If we find
+        // one and followed by a whitespace, we will want to show the
         // autocomplete dropdown!
         var value = this.value;
         emojiStart = 0;
         for (var i = cursor - 1; i >= 0; i--) {
           var character = value.substr(i, 1);
+          // check what user typed, emoji names only contains alphanumeric,
+          // underline, '+' and '-'
           if (!/[a-z0-9]|\+|\-|_|\:/.test(character)) break;
+          // make sure ':' followed by a whitespace
           if (character === ':' && (i == 0 || value.substr(i - 1, 1) === ' ')) {
             emojiStart = i + 1;
             break;
diff --git a/extensions/emoji/js/forum/src/addComposerAutocomplete.js b/extensions/emoji/js/forum/src/addComposerAutocomplete.js
index b878b3806..295d5584e 100644
--- a/extensions/emoji/js/forum/src/addComposerAutocomplete.js
+++ b/extensions/emoji/js/forum/src/addComposerAutocomplete.js
@@ -44,14 +44,17 @@ export default function addComposerAutocomplete() {
 
         if (this.selectionEnd - cursor > 0) return;
 
-        // Search backwards from the cursor for an ':' symbol, without any
-        // intervening whitespace. If we find one, we will want to show the
+        // Search backwards from the cursor for an ':' symbol. If we find
+        // one and followed by a whitespace, we will want to show the
         // autocomplete dropdown!
         const value = this.value;
         emojiStart = 0;
         for (let i = cursor - 1; i >= 0; i--) {
           const character = value.substr(i, 1);
+          // check what user typed, emoji names only contains alphanumeric,
+          // underline, '+' and '-'
           if (!/[a-z0-9]|\+|\-|_|\:/.test(character)) break;
+          // make sure ':' followed by a whitespace
           if (character === ':' && (i == 0 || value.substr(i-1, 1) === ' ')) {
             emojiStart = i + 1;
             break;