diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index 00b50456e..380ba722f 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -261,11 +261,13 @@ class AtomEnvironment extends Model
 
     @packages.reset()
 
-    @project.reset(@packages)
-
     @workspace.reset(@packages)
     @registerDefaultOpeners()
 
+    @project.reset(@packages)
+
+    @workspace.subscribeToEvents()
+
     @views.clear()
     @registerDefaultViewProviders()
 
diff --git a/src/workspace.coffee b/src/workspace.coffee
index 37f4ac5a6..0a66c226a 100644
--- a/src/workspace.coffee
+++ b/src/workspace.coffee
@@ -49,8 +49,7 @@ class Workspace extends Model
       bottom: new PanelContainer({location: 'bottom'})
       modal: new PanelContainer({location: 'modal'})
 
-    @subscribeToActiveItem()
-    @subscribeToFontSize()
+    @subscribeToEvents()
 
   reset: (@packageManager) ->
     @emitter.dispose()
@@ -74,6 +73,7 @@ class Workspace extends Model
     @destroyedItemURIs = []
     @consumeServices(@packageManager)
 
+  subscribeToEvents: ->
     @subscribeToActiveItem()
     @subscribeToFontSize()