Index: Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r0fe90cd590613f74567c85622bbd2235419a5d5f -re6e019dca3ff110f39c0a5bb0b1a91eea916489d
--- Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 0fe90cd590613f74567c85622bbd2235419a5d5f)
+++ Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision e6e019dca3ff110f39c0a5bb0b1a91eea916489d)
@@ -232,14 +232,34 @@
             {
                 return;
             }
-            
+
             ToggleButton checkedStateToggleButton = stateToggleButtonLookup.Keys.FirstOrDefault(stb => stb.IsChecked.HasValue && stb.IsChecked.Value);
 
             ProjectExplorer.Data = checkedStateToggleButton != null
                                        ? stateToggleButtonLookup[checkedStateToggleButton](gui.Project)
                                        : null;
         }
 
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (IsWindowDisposed || !disposing)
+            {
+                return;
+            }
+
+            IsWindowDisposed = true;
+
+            Close();
+
+            SetGui(null);
+        }
+
         /// <summary>
         /// Adds a state button to the <see cref="MainButtonStackPanel"/>.
         /// </summary>
@@ -267,28 +287,10 @@
 
             if (stateToggleButtonLookup.Count == 1)
             {
-                HandleStateButtonClick(stateToggleButton);
-            }
-        }
+                stateToggleButton.IsChecked = true;
 
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (IsWindowDisposed || !disposing)
-            {
-                return;
+                UpdateProjectExplorer();
             }
-
-            IsWindowDisposed = true;
-
-            Close();
-
-            SetGui(null);
         }
 
         private void HandleStateButtonClick(ToggleButton clickedStateToggleButton)
@@ -497,9 +499,9 @@
         private void InitProjectExplorerWindow()
         {
             ProjectExplorer = new ProjectExplorer.ProjectExplorer(gui.ViewCommands, gui.GetTreeNodeInfos());
-            
+
             viewController.ViewHost.AddToolView(ProjectExplorer, ToolViewLocation.Left, "\uE95B");
-            
+
             UpdateProjectExplorer();
         }
 
Index: Riskeer/Integration/src/Riskeer.Integration.Data/RiskeerProjectFactory.cs
===================================================================
diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -re6e019dca3ff110f39c0a5bb0b1a91eea916489d
--- Riskeer/Integration/src/Riskeer.Integration.Data/RiskeerProjectFactory.cs	(.../RiskeerProjectFactory.cs)	(revision c36b47c2e1e8cf948767cca33f80ad735f370ad0)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/RiskeerProjectFactory.cs	(.../RiskeerProjectFactory.cs)	(revision e6e019dca3ff110f39c0a5bb0b1a91eea916489d)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using Core.Common.Base.Data;
+using Riskeer.Common.Data.AssessmentSection;
 
 namespace Riskeer.Integration.Data
 {
@@ -30,7 +31,13 @@
     {
         public IProject CreateNewProject()
         {
-            return new RiskeerProject();
+            return new RiskeerProject
+            {
+                AssessmentSections =
+                {
+                    new AssessmentSection(AssessmentSectionComposition.Dike)
+                }
+            };
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r369400e3add949c344017f34f89620f095eac05a -re6e019dca3ff110f39c0a5bb0b1a91eea916489d
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 369400e3add949c344017f34f89620f095eac05a)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision e6e019dca3ff110f39c0a5bb0b1a91eea916489d)
@@ -280,40 +280,40 @@
             {
                 if (project is RiskeerProject riskeerProject)
                 {
-                    return riskeerProject.AssessmentSections.FirstOrDefault();
+                    return riskeerProject.AssessmentSections.First();
                 }
 
-                return project;
+                return null;
             });
 
             yield return new StateInfo("Faalpaden", "\uE953", project =>
             {
                 if (project is RiskeerProject riskeerProject)
                 {
-                    return riskeerProject.AssessmentSections.FirstOrDefault();
+                    return riskeerProject.AssessmentSections.First();
                 }
 
-                return project;
+                return null;
             });
 
             yield return new StateInfo("Berekeningen", "\uE91D", project =>
             {
                 if (project is RiskeerProject riskeerProject)
                 {
-                    return riskeerProject.AssessmentSections.FirstOrDefault();
+                    return riskeerProject.AssessmentSections.First();
                 }
 
-                return project;
+                return null;
             });
 
             yield return new StateInfo("Assembleren", "\uE94B", project =>
             {
                 if (project is RiskeerProject riskeerProject)
                 {
-                    return riskeerProject.AssessmentSections.FirstOrDefault();
+                    return riskeerProject.AssessmentSections.First();
                 }
 
-                return project;
+                return null;
             });
         }