diff --git a/spec/main-process/atom-application.test.js b/spec/main-process/atom-application.test.js
index 914c1cead..0e5810aad 100644
--- a/spec/main-process/atom-application.test.js
+++ b/spec/main-process/atom-application.test.js
@@ -326,7 +326,6 @@ describe('AtomApplication', function () {
       })
       assert.deepEqual(directories, [{type: 'FakeRemoteDirectory', path: remotePath}])
 
-      await window.saveState()
       await window.reload()
       await focusWindow(window)
       directories = await evalInWebContents(window.browserWindow.webContents, function (sendBackToMainProcess) {
diff --git a/src/main-process/atom-window.coffee b/src/main-process/atom-window.coffee
index 5802bdf8d..876a18d13 100644
--- a/src/main-process/atom-window.coffee
+++ b/src/main-process/atom-window.coffee
@@ -257,7 +257,7 @@ class AtomWindow
   reload: ->
     @applicationStartedPromise = new Promise (resolve) =>
       @browserWindow.once('window:application-started', resolve)
-    @browserWindow.reload()
+    @saveState().then => @browserWindow.reload()
     @applicationStartedPromise
 
   toggleDevTools: -> @browserWindow.toggleDevTools()