diff --git a/src/atom.coffee b/src/atom.coffee
index a6624c5bb..f494e6114 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -667,9 +667,6 @@ class Atom extends Model
     document.querySelector(@workspaceParentSelectorctor).appendChild(workspaceElement)
 
   deserializeEditorWindow: ->
-    if grammarOverridesByPath = @state.grammars?.grammarOverridesByPath
-      @grammars.grammarOverridesByPath = grammarOverridesByPath
-
     @deserializeWorkspace()
 
   loadThemes: ->
@@ -731,6 +728,9 @@ class Atom extends Model
 
     @deserializeTimings.atom = Date.now() -  startTime
 
+    if grammarOverridesByPath = @state.grammars?.grammarOverridesByPath
+      @grammars.grammarOverridesByPath = grammarOverridesByPath
+
     @packages.packageStates = @state.packageStates ? {}
 
     startTime = Date.now()