diff --git a/src/atom-application.coffee b/src/atom-application.coffee
index a2c48b3d6..bd599bf0b 100644
--- a/src/atom-application.coffee
+++ b/src/atom-application.coffee
@@ -19,23 +19,15 @@ class AtomApplication
   configWindow: null
   menu: null
   resourcePath: null
-  executedFrom: null
   pathsToOpen: null
   testMode: null
   version: null
   socketPath: '/tmp/atom.sock'
 
-  constructor: ({@resourcePath, @executedFrom, @pathsToOpen, @testMode, @version, wait, pid}) ->
+  constructor: ({@resourcePath, @pathsToOpen, @testMode, @version, wait, pid}) ->
     @pidsToOpenWindows = {}
-    if @pathsToOpen?
-      @pathsToOpen = @pathsToOpen.map (pathToOpen) =>
-        path.resolve(@executedFrom, pathToOpen)
-    else if @executedFrom
-      @pathsToOpen = [@executedFrom]
-    else
-      @pathsToOpen = [null]
+    @pathsToOpen ?= [null]
 
-    @executedFrom ?= process.cwd()
     pidToKillWhenClosed = pid if wait
     atomApplication = this
     @windows = []
diff --git a/src/main.coffee b/src/main.coffee
index 3af69df4a..801c37ecd 100644
--- a/src/main.coffee
+++ b/src/main.coffee
@@ -36,6 +36,9 @@ parseCommandLine = ->
 
   executedFrom = args['executed-from']
   pathsToOpen = if args._.length > 0 then args._ else null
+  pathsToOpen ?= [executedFrom] if executedFrom
+  pathsToOpen = pathsToOpen.map (pathToOpen) ->
+    path.resolve(executedFrom ? process.cwd(), pathToOpen)
   testMode = true if args['test']
   wait = true if args['wait']
   pid = args['pid']