diff --git a/src/browser/atom-window.coffee b/src/browser/atom-window.coffee
index aaad4a0f3..912c567ab 100644
--- a/src/browser/atom-window.coffee
+++ b/src/browser/atom-window.coffee
@@ -21,6 +21,10 @@ class AtomWindow
 
   constructor: (settings={}) ->
     {@resourcePath, pathToOpen, initialLine, initialColumn, @isSpec, @exitWhenDone} = settings
+
+    # Normalize to make sure drive letter case is consistent on Windows
+    @resourcePath = path.normalize(@resourcePath) if @resourcePath
+
     global.atomApplication.addWindow(this)
 
     @browserWindow = new BrowserWindow show: false, title: 'Atom', icon: @constructor.iconPath
@@ -29,6 +33,7 @@ class AtomWindow
     loadSettings = _.extend({}, settings)
     loadSettings.windowState ?= '{}'
     loadSettings.appVersion = app.getVersion()
+    loadSettings.resourcePath = @resourcePath
 
     # Only send to the first non-spec window created
     if @constructor.includeShellLoadTime and not @isSpec
diff --git a/src/browser/main.coffee b/src/browser/main.coffee
index 9fa0b54a1..514cea9fa 100644
--- a/src/browser/main.coffee
+++ b/src/browser/main.coffee
@@ -109,9 +109,6 @@ parseCommandLine = ->
   catch
     resourcePath = path.dirname(path.dirname(__dirname))
 
-  # Normalize to make sure drive letter case is consistent on Windows
-  resourcePath = path.normalize(resourcePath) if resourcePath
-
   {resourcePath, pathsToOpen, executedFrom, test, version, pidToKillWhenClosed, devMode, safeMode, newWindow, specDirectory, logFile}
 
 start()