diff --git a/plugins/emoji/assets/javascripts/emoji.js.erb b/plugins/emoji/assets/javascripts/emoji.js.erb
index 2eeef638a..f1faf62e9 100644
--- a/plugins/emoji/assets/javascripts/emoji.js.erb
+++ b/plugins/emoji/assets/javascripts/emoji.js.erb
@@ -42,7 +42,7 @@
       var lastToken = prev[prev.length-1];
       if (lastToken && lastToken.charAt) {
         var lastChar = lastToken.charAt(lastToken.length-1);
-        if (lastChar !== ' ') return false;
+        if (lastChar !== ' ' && lastChar !== "\n") return false;
       }
     }
     return true;