diff --git a/src/app/window.coffee b/src/app/window.coffee
index 97c0d9486..c3152c7e6 100644
--- a/src/app/window.coffee
+++ b/src/app/window.coffee
@@ -64,9 +64,8 @@ windowAdditions =
     if windowState?.project?
       window.project = deserialize(windowState.project)
       window.rootView = deserialize(windowState.rootView)
-    else
-      window.project = new Project(atom.getPathToOpen())
-      window.rootView = new RootView
+    window.project ?= new Project(atom.getPathToOpen())
+    window.rootView ?= new RootView
     $(rootViewParentSelector).append(rootView)
 
   stopApplication: ->