Index: Core/Gui/src/Core.Gui/Forms/Main/MainWindow.xaml
===================================================================
diff -u -r51a9721e725b26c1cd23d0cd54dc384aa8bbb927 -r5fad04eb4f743ebc8b04307b6c7c04b2d9fbbf36
--- Core/Gui/src/Core.Gui/Forms/Main/MainWindow.xaml	(.../MainWindow.xaml)	(revision 51a9721e725b26c1cd23d0cd54dc384aa8bbb927)
+++ Core/Gui/src/Core.Gui/Forms/Main/MainWindow.xaml	(.../MainWindow.xaml)	(revision 5fad04eb4f743ebc8b04307b6c7c04b2d9fbbf36)
@@ -32,12 +32,12 @@
                    xmlns:commands="clr-namespace:Core.Gui.Commands"
                    mc:Ignorable="d" 
                    Title="MainWindow"
-                   MinWidth="1366"
-                   MinHeight="768"
+                   Width="1366"
+                   Height="768"
                    x:Name="Window"
                    ResizeMode="CanResizeWithGrip"
                    FlowDirection="LeftToRight"
-                   Loaded="MainWindow_OnLoaded">
+                   WindowState="Maximized">
     
     <commands:RoutedCommandHandlers.Commands>
         <commands:RoutedCommandHandler RoutedCommand="{x:Static commands:MainWindowCommands.NewProjectCommand}"
Index: Core/Gui/src/Core.Gui/Forms/Main/MainWindow.xaml.cs
===================================================================
diff -u -rf45ed66bb2ead371b5bb02b8350f98b035bd7be7 -r5fad04eb4f743ebc8b04307b6c7c04b2d9fbbf36
--- Core/Gui/src/Core.Gui/Forms/Main/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision f45ed66bb2ead371b5bb02b8350f98b035bd7be7)
+++ Core/Gui/src/Core.Gui/Forms/Main/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 5fad04eb4f743ebc8b04307b6c7c04b2d9fbbf36)
@@ -628,11 +628,6 @@
 
         #region Events
 
-        private void MainWindow_OnLoaded(object sender, RoutedEventArgs e)
-        {
-            WindowState = WindowState.Maximized;
-        }
-
         private void OnViewOpened(object sender, ViewChangeEventArgs e)
         {
             var mapView = e.View as IMapView;
Index: Core/Gui/test/Core.Gui.Test/Forms/Main/MainWindowTest.cs
===================================================================
diff -u -rf45ed66bb2ead371b5bb02b8350f98b035bd7be7 -r5fad04eb4f743ebc8b04307b6c7c04b2d9fbbf36
--- Core/Gui/test/Core.Gui.Test/Forms/Main/MainWindowTest.cs	(.../MainWindowTest.cs)	(revision f45ed66bb2ead371b5bb02b8350f98b035bd7be7)
+++ Core/Gui/test/Core.Gui.Test/Forms/Main/MainWindowTest.cs	(.../MainWindowTest.cs)	(revision 5fad04eb4f743ebc8b04307b6c7c04b2d9fbbf36)
@@ -102,6 +102,7 @@
                                "'mainWindow' instance on same thread as test, therefore invocation not required.");
 
                 Assert.AreEqual("MainWindow", mainWindow.Title);
+                Assert.AreEqual(WindowState.Maximized, mainWindow.WindowState);
                 Assert.AreEqual(ResizeMode.CanResizeWithGrip, mainWindow.ResizeMode);
                 Assert.AreEqual(FlowDirection.LeftToRight, mainWindow.FlowDirection);
                 Assert.AreEqual("MainWindow", mainWindow.Name);