diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs
index d6c1f8f..45e9d7a 100644
--- a/EduNetworkBuilder/NetworkBuilder.cs
+++ b/EduNetworkBuilder/NetworkBuilder.cs
@@ -1434,6 +1434,14 @@ namespace EduNetworkBuilder
         private void BuilderWindow_FormClosing(object sender, FormClosingEventArgs e)
         {
             //The values in the settings are all up-to-date.  Just tell them to save.
+            if (WindowState == FormWindowState.Normal)
+            {
+                OurSettings.MainWindowHeight = Height;
+                OurSettings.MainWindowWidth = Width;
+                OurSettings.MainWindowX = Location.X;
+                OurSettings.MainWindowY = Location.Y;
+            }
+
             OurSettings.Save(NB.IsRunningOnMono());
         }