From 8caed1f4d28b317998b38fc12a42d073c8375c6e Mon Sep 17 00:00:00 2001
From: Joseph Moreno <44370115+josephmoresena@users.noreply.github.com>
Date: Sat, 11 Feb 2023 00:41:41 -0500
Subject: [PATCH] More fixes

---
 src/App.axaml.cs                | 2 ++
 src/Windows/MainWindow.axaml.cs | 1 +
 2 files changed, 3 insertions(+)

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;