diff --git a/src/flux/stores/workspace-store.coffee b/src/flux/stores/workspace-store.coffee
index 4e6ae22ff..3c61b8c32 100644
--- a/src/flux/stores/workspace-store.coffee
+++ b/src/flux/stores/workspace-store.coffee
@@ -30,6 +30,7 @@ class WorkspaceStore extends NylasStore
     atom.config.observe 'core.workspace.mode', (mode) =>
       return if mode is @_preferredLayoutMode
       @_preferredLayoutMode = mode
+      @popToRootSheet()
       @trigger()
 
     atom.commands.add 'body',