diff --git a/lib/ace/mode/coffee_highlight_rules.js b/lib/ace/mode/coffee_highlight_rules.js
index 9bea4d58..0a6af07b 100644
--- a/lib/ace/mode/coffee_highlight_rules.js
+++ b/lib/ace/mode/coffee_highlight_rules.js
@@ -86,7 +86,7 @@ define(function(require, exports, module) {
                     regex : "(?:(?:\\.|::)\\s*)" + identifier
                 }, {
                     token : "variable",
-                    regex : "@" + identifier
+                    regex : "@(?:" + identifier + ")?"
                 }, {
                     token: function(value) {
                         if (keywords.hasOwnProperty(value))