diff --git a/extensions/emoji/js/forum/dist/extension.js b/extensions/emoji/js/forum/dist/extension.js
index b5a1ad921..99a7dd1a2 100644
--- a/extensions/emoji/js/forum/dist/extension.js
+++ b/extensions/emoji/js/forum/dist/extension.js
@@ -186,8 +186,8 @@ System.register('flarum/emoji/addComposerAutocomplete', ['flarum/extend', 'flaru
           // 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) === ' ')) {
+          // make sure ':' followed by a whitespace or newline
+          if (character === ':' && (i == 0 || /\s/.test(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 295d5584e..449d97f64 100644
--- a/extensions/emoji/js/forum/src/addComposerAutocomplete.js
+++ b/extensions/emoji/js/forum/src/addComposerAutocomplete.js
@@ -54,8 +54,8 @@ export default function addComposerAutocomplete() {
           // 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) === ' ')) {
+          // make sure ':' followed by a whitespace or newline
+          if (character === ':' && (i == 0 || /\s/.test(value.substr(i - 1, 1)))) {
             emojiStart = i + 1;
             break;
           }