Index: Core/Gui/src/Core.Gui/Forms/Main/MainWindow.xaml.cs
===================================================================
diff -u -rc144b5851ab969edaa625c77cc725939386e1861 -rece9b7b2fdb13bf73c2b513a71b4523d68d48274
--- Core/Gui/src/Core.Gui/Forms/Main/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision c144b5851ab969edaa625c77cc725939386e1861)
+++ Core/Gui/src/Core.Gui/Forms/Main/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision ece9b7b2fdb13bf73c2b513a71b4523d68d48274)
@@ -328,6 +328,8 @@
                 firstStateToggleButton.IsChecked = true;
 
                 HandleStateButtonClick(firstStateToggleButton);
+
+                gui.DocumentViewController.OpenViewForData(stateToggleButtonLookup[firstStateToggleButton](gui.Project));
             }
         }
 
@@ -348,10 +350,6 @@
                 stateToggleButton.IsChecked = false;
             }
 
-            gui.DocumentViewController.CloseAllViews();
-
-            gui.DocumentViewController.OpenViewForData(stateToggleButtonLookup[clickedStateToggleButton](gui.Project));
-
             UpdateProjectExplorer();
         }