diff --git a/src/atom.coffee b/src/atom.coffee
index 182245feb..1b65ca7e2 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -333,6 +333,7 @@ class Atom extends Model
   unloadEditorWindow: ->
     return if not @project and not @workspaceView
 
+    @storeGrammarsForOpenEditors()
     @state.syntax = @syntax.serialize()
     @state.project = @project.serialize()
     @state.workspace = @workspace.serialize()
diff --git a/src/window-event-handler.coffee b/src/window-event-handler.coffee
index aa9568324..4e29717c1 100644
--- a/src/window-event-handler.coffee
+++ b/src/window-event-handler.coffee
@@ -42,7 +42,6 @@ class WindowEventHandler
 
     @subscribe $(window), 'unload', ->
       atom.storeWindowDimensions()
-      atom.storeGrammarsForOpenEditors()
 
     @subscribeToCommand $(window), 'window:toggle-full-screen', -> atom.toggleFullScreen()