diff --git a/src/editor-view.coffee b/src/editor-view.coffee
index 1d4d6a475..18f8a2427 100644
--- a/src/editor-view.coffee
+++ b/src/editor-view.coffee
@@ -547,7 +547,6 @@ class EditorView extends View
       @showBufferConflictAlert(@editor)
 
     @subscribe @editor, "path-changed", =>
-      @editor.reloadGrammar()
       @trigger 'editor:path-changed'
 
     @subscribe @editor, "grammar-changed", =>
diff --git a/src/tokenized-buffer.coffee b/src/tokenized-buffer.coffee
index 6fc270f7a..01886ee0a 100644
--- a/src/tokenized-buffer.coffee
+++ b/src/tokenized-buffer.coffee
@@ -31,7 +31,9 @@ class TokenizedBuffer extends Model
 
     @on 'grammar-changed grammar-updated', => @resetTokenizedLines()
     @subscribe @buffer, "changed", (e) => @handleBufferChange(e)
-    @subscribe @buffer, "path-changed", => @bufferPath = @buffer.getPath()
+    @subscribe @buffer, "path-changed", =>
+      @bufferPath = @buffer.getPath()
+      @reloadGrammar()
 
     @subscribe @$tabLength.changes, (tabLength) =>
       lastRow = @buffer.getLastRow()