Index: Core/Gui/src/Core.Gui/Forms/Main/MainWindow.xaml.cs
===================================================================
diff -u -rece9b7b2fdb13bf73c2b513a71b4523d68d48274 -re22a39931dfa4f9b9856df0b0d043a7cb4ba9069
--- Core/Gui/src/Core.Gui/Forms/Main/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision ece9b7b2fdb13bf73c2b513a71b4523d68d48274)
+++ Core/Gui/src/Core.Gui/Forms/Main/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision e22a39931dfa4f9b9856df0b0d043a7cb4ba9069)
@@ -307,6 +307,8 @@
                 return;
             }
 
+            gui.DocumentViewController.CloseAllViews();
+
             if (gui.Project == null)
             {
                 stateToggleButtonLookup.Keys.ForEachElementDo(stb =>
@@ -315,8 +317,6 @@
                     stb.IsEnabled = false;
                 });
 
-                gui.DocumentViewController.CloseAllViews();
-
                 UpdateProjectExplorer();
             }
             else