Merge commit '1320ff28c39afd563820b30b43389ea38552e74c' into fix-12495

src/application-delegate.coffee

@@ -112,6 +112,7 @@ class ApplicationDelegate
     loadSettings = getWindowLoadSettings()
     loadSettings['initialPaths'] = paths
     setWindowLoadSettings(loadSettings)
+    ipcRenderer.send("did-change-paths")
 
   setAutoHideWindowMenuBar: (autoHide) ->
     ipcHelpers.call('window-method', 'setAutoHideMenuBar', autoHide)

src/main-process/atom-application.coffee

@@ -385,6 +385,9 @@ class AtomApplication
       @fileRecoveryService.didSavePath(@atomWindowForEvent(event), path)
       event.returnValue = true
 
+    @disposable.add ipcHelpers.on ipcMain, 'did-change-paths', =>
+      @saveState(false)
+
   setupDockMenu: ->
     if process.platform is 'darwin'
       dockMenu = Menu.buildFromTemplate [