diff --git a/src/editor-view.coffee b/src/editor-view.coffee
index 94f85392d..1352e488a 100644
--- a/src/editor-view.coffee
+++ b/src/editor-view.coffee
@@ -560,6 +560,7 @@ class EditorView extends View
       @trigger 'editor:path-changed'
 
     @subscribe @editor, "grammar-changed", =>
+      @addGrammarScopeClasses()
       @trigger 'editor:grammar-changed'
 
     @subscribe @editor, 'selection-added', (selection) =>
@@ -585,6 +586,11 @@ class EditorView extends View
     if @attached and @editor.buffer.isInConflict()
       _.defer => @showBufferConflictAlert(@editor) # Display after editor has a chance to display
 
+  addGrammarScopeClasses: ->
+    scopeParts = @editor.getGrammar()?.scopeName?.split('.')
+    classes = scopeParts.join(' ') if scopeParts?.length
+    @addClass(classes) if classes?
+
   getModel: ->
     @editor