Index: Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -rbe9c50305cdfcaa53083cf7a4608d68cbd5ea264 -rb65f84b0e8b9ca6e7a8a81c38edfdebff302f612
--- Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision be9c50305cdfcaa53083cf7a4608d68cbd5ea264)
+++ Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision b65f84b0e8b9ca6e7a8a81c38edfdebff302f612)
@@ -31,6 +31,7 @@
 using System.Windows.Interop;
 using Core.Common.Base.Data;
 using Core.Common.Controls.Views;
+using Core.Common.Util.Extensions;
 using Core.Common.Util.Settings;
 using Core.Components.Chart.Forms;
 using Core.Components.Gis.Forms;
@@ -307,13 +308,6 @@
             MainButtonStackPanel.Children.Insert(MainButtonStackPanel.Children.Count - 1, stateToggleButton);
 
             stateToggleButtonLookup.Add(stateToggleButton, getRootData);
-
-            if (stateToggleButtonLookup.Count == 1)
-            {
-                stateToggleButton.IsChecked = true;
-
-                UpdateProjectExplorer();
-            }
         }
 
         private void HandleStateButtonClick(ToggleButton clickedStateToggleButton)
@@ -338,6 +332,16 @@
             UpdateProjectExplorer();
         }
 
+        private void ResetState()
+        {
+            if (stateToggleButtonLookup.Any())
+            {
+                stateToggleButtonLookup.Keys.ForEachElementDo(stb => stb.IsChecked = false);
+
+                HandleStateButtonClick(stateToggleButtonLookup.First().Key);
+            }
+        }
+
         #region Commands
 
         /// <summary>
@@ -408,6 +412,7 @@
         private void OnNewProject(object obj)
         {
             commands.StorageCommands.CreateNewProject(() => settings.FixedSettings.OnCreateNewProjectFunc(gui));
+            ResetState();
             CloseBackstage();
         }
 
@@ -433,6 +438,7 @@
             if (!string.IsNullOrEmpty(projectPath))
             {
                 commands.StorageCommands.OpenExistingProject(projectPath);
+                ResetState();
                 CloseBackstage();
             }
         }