diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 0cd350c..8cf244d 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -100,6 +100,8 @@ namespace AvaloniaCoreRTDemo
 
                 desktop.MainWindow = newWindow;
                 this.DataContext = newWindow.DataContext;
+
+                oldWindow.Hide();
                 newWindow.Show();
                 oldWindow.Close();
             }
diff --git a/src/Windows/MainWindow.axaml.cs b/src/Windows/MainWindow.axaml.cs
index 6c1f4ae..4df6271 100644
--- a/src/Windows/MainWindow.axaml.cs
+++ b/src/Windows/MainWindow.axaml.cs
@@ -37,6 +37,7 @@ namespace AvaloniaCoreRTDemo.Windows
             if (window is not null)
             {
                 this.MainControl.Reload(window.Model);
+                this.WindowStartupLocation = WindowStartupLocation.Manual;
                 this.WindowState = window.State;
                 this.Position = window.Position;
                 this.FrameSize = window.FrameSize;