diff --git a/spec/main-process/atom-application.test.js b/spec/main-process/atom-application.test.js
index 0c3218a99..408ea84ff 100644
--- a/spec/main-process/atom-application.test.js
+++ b/spec/main-process/atom-application.test.js
@@ -14,9 +14,10 @@ const ATOM_RESOURCE_PATH = path.resolve(__dirname, '..', '..')
 describe('AtomApplication', function () {
   this.timeout(60 * 1000)
 
-  let originalAtomHome, atomApplicationsToDestroy
+  let originalAppQuit, originalAtomHome, atomApplicationsToDestroy
 
   beforeEach(function () {
+    originalAppQuit = electron.app.quit
     originalAtomHome = process.env.ATOM_HOME
     process.env.ATOM_HOME = makeTempDir('atom-home')
     // Symlinking the compile cache into the temporary home dir makes the windows load much faster
@@ -31,6 +32,7 @@ describe('AtomApplication', function () {
   })
 
   afterEach(async function () {
+    electron.app.quit = originalAppQuit
     process.env.ATOM_HOME = originalAtomHome
     for (let atomApplication of atomApplicationsToDestroy) {
       await atomApplication.destroy()
@@ -368,6 +370,23 @@ describe('AtomApplication', function () {
     })
   })
 
+  describe('before quitting', function () {
+    it('waits until all the windows have saved their state and then quits', async function () {
+      mockElectronAppQuit()
+      const dirAPath = makeTempDir("a")
+      const dirBPath = makeTempDir("b")
+      const atomApplication = buildAtomApplication()
+      const window1 = atomApplication.launch(parseCommandLine([path.join(dirAPath, 'file-a')]))
+      await focusWindow(window1)
+      const window2 = atomApplication.launch(parseCommandLine([path.join(dirBPath, 'file-b')]))
+      await focusWindow(window2)
+      electron.app.quit()
+      assert(!electron.app.hasQuitted())
+      await Promise.all([window1.lastSaveStatePromise, window2.lastSaveStatePromise])
+      assert(electron.app.hasQuitted())
+    })
+  })
+
   function buildAtomApplication () {
     const atomApplication = new AtomApplication({
       resourcePath: ATOM_RESOURCE_PATH,
@@ -383,6 +402,20 @@ describe('AtomApplication', function () {
     await conditionPromise(() => window.atomApplication.lastFocusedWindow === window)
   }
 
+  function mockElectronAppQuit () {
+    let quitted = false
+    electron.app.quit = function () {
+      let shouldQuit = true
+      electron.app.emit('before-quit', {preventDefault: () => { shouldQuit = false }})
+      if (shouldQuit) {
+        quitted = true
+      }
+    }
+    electron.app.hasQuitted = function () {
+      return quitted
+    }
+  }
+
   function makeTempDir (name) {
     return fs.realpathSync(require('temp').mkdirSync(name))
   }
diff --git a/src/main-process/atom-window.coffee b/src/main-process/atom-window.coffee
index b0490f940..236fbf8e0 100644
--- a/src/main-process/atom-window.coffee
+++ b/src/main-process/atom-window.coffee
@@ -178,13 +178,14 @@ class AtomWindow
     @unloading = false
 
   saveState: ->
-    new Promise (resolve) =>
+    @lastSaveStatePromise = new Promise (resolve) =>
       callback = (event) =>
         if BrowserWindow.fromWebContents(event.sender) is @browserWindow
           ipcMain.removeListener('did-save-window-state', callback)
           resolve()
       ipcMain.on('did-save-window-state', callback)
       @browserWindow.webContents.send('save-window-state')
+    @lastSaveStatePromise
 
   openPath: (pathToOpen, initialLine, initialColumn) ->
     @openLocations([{pathToOpen, initialLine, initialColumn}])