diff --git a/ObservatoryCore/UI/Views/MainWindow.axaml.cs b/ObservatoryCore/UI/Views/MainWindow.axaml.cs
index 198792d..02ea9b3 100644
--- a/ObservatoryCore/UI/Views/MainWindow.axaml.cs
+++ b/ObservatoryCore/UI/Views/MainWindow.axaml.cs
@@ -1,8 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using System.Collections.Generic;
-using System.Data;
 
 
 namespace Observatory.UI.Views
@@ -15,7 +13,17 @@ namespace Observatory.UI.Views
 #if DEBUG
             this.AttachDevTools();
 #endif
-
+            Height = Properties.Core.Default.MainWindowSize.Height;
+            Width = Properties.Core.Default.MainWindowSize.Width;
+            Position = new PixelPoint(Properties.Core.Default.MainWindowPosition.X, Properties.Core.Default.MainWindowPosition.Y);
+            Closing += (object sender, System.ComponentModel.CancelEventArgs e) =>
+            {
+                var size = new System.Drawing.Size((int)System.Math.Round(Width), (int)System.Math.Round(Height));
+                var position = new System.Drawing.Point(Position.X, Position.Y);
+                Properties.Core.Default.MainWindowSize = size;
+                Properties.Core.Default.MainWindowPosition = position;
+                Properties.Core.Default.Save();
+            };
         }
 
         private void InitializeComponent()