diff --git a/app/assets/javascripts/autocomplete.js b/app/assets/javascripts/autocomplete.js
index 39a4d9b67..4f58cda3e 100644
--- a/app/assets/javascripts/autocomplete.js
+++ b/app/assets/javascripts/autocomplete.js
@@ -68,8 +68,12 @@
           }
 
           if (req.term[i-1] === "@") {
-            name = req.term.substring(i, cursor);
-            break;
+            if (i == 1 || /[ \r\n]/.test(req.term[i-2])) {
+              name = req.term.substring(i, cursor);
+              break;
+            } else {
+              return;
+            }
           }
         }