diff --git a/CoffeeScript.sublime-syntax b/CoffeeScript.sublime-syntax
index 5ce4403..8779aee 100644
--- a/CoffeeScript.sublime-syntax
+++ b/CoffeeScript.sublime-syntax
@@ -102,6 +102,8 @@ contexts:
         - class-name
 
   class-name:
+    - match: $
+      pop: 1
     - match: (?=extends\b)
       pop: 1
     - match: ({{identifier}})(\.)
diff --git a/tests/syntax_test_scope.coffee b/tests/syntax_test_scope.coffee
index fe0eb38..e0d1b82 100644
--- a/tests/syntax_test_scope.coffee
+++ b/tests/syntax_test_scope.coffee
@@ -67,6 +67,11 @@ class App.Router extends Snakeskin.Router
 #                                 ^ punctuation.accessor.dot.coffee
 #                                  ^^^^^^ entity.other.inherited-class.coffee
 
+class
+# <- meta.class.coffee keyword.declaration.class.coffee
+  constructor: ->
+# ^ meta.function.identifier.coffee entity.name.function.coffee
+
 ###[ FUNCTIONS ]###############################################################
 
   name: