diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index 185aadb602..4f2bd66d2c 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -192,6 +192,7 @@ CodeMirror.defineMode('coffeescript', function(conf) {
                 state.tokenize = tokenBase;
                 break;
             }
+            stream.eatWhile("#");
         }
         return "comment"
     }
@@ -256,13 +257,8 @@ CodeMirror.defineMode('coffeescript', function(conf) {
 
         // Handle properties
         if (current === '@') {
-            style = state.tokenize(stream, state);
-            current = stream.current();
-            if (style === 'variable') {
-                return 'variable-2';
-            } else {
-                return ERRORCLASS;
-            }
+            stream.eat('@');
+            return 'keyword';
         }
 
         // Handle scope changes.