diff --git a/CompactGUI/Models/SetttingsHandler.vb b/CompactGUI/Models/SetttingsHandler.vb
index 5f1be2e..80d96a5 100644
--- a/CompactGUI/Models/SetttingsHandler.vb
+++ b/CompactGUI/Models/SetttingsHandler.vb
@@ -64,6 +64,14 @@ Public Class SettingsHandler : Inherits ObservableObject
             AppSettings.WindowWidth = 500
         End If
 
+        Dim scHeight = SystemParameters.MaximizedPrimaryScreenHeight * 0.9
+
+        If scHeight < AppSettings.WindowHeight Then
+            AppSettings.WindowHeight = scHeight
+            AppSettings.WindowWidth = scHeight * 0.625
+            AppSettings.WindowScalingFactor = scHeight / 800
+        End If
+
     End Sub
 
 
diff --git a/CompactGUI/Views/MainWindow.xaml b/CompactGUI/Views/MainWindow.xaml
index 0f862cb..1a72c47 100644
--- a/CompactGUI/Views/MainWindow.xaml
+++ b/CompactGUI/Views/MainWindow.xaml
@@ -9,7 +9,7 @@
         mc:Ignorable="d" xmlns:ui="http://schemas.modernwpf.com/2019" xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase" d:DataContext="{d:DesignInstance Type=local:MainViewModel}" RenderOptions.ClearTypeHint="Enabled"
         WindowState="{Binding WindowState}" ShowInTaskbar="{Binding ShowInTaskbar}" AllowDrop="True" Drop="Window_Drop"
         ui:WindowHelper.UseModernWindowStyle="True" ui:TitleBar.ExtendViewIntoTitleBar="True"
-        Title="CompactGUI" 
+        Title="CompactGUI" Loaded="MainWindow_Loaded"
         Height="{Binding BindableSettings.WindowHeight, Mode=TwoWay,FallbackValue=800}"  
         Width="{Binding BindableSettings.WindowWidth, Mode=TwoWay, FallbackValue=500}" ResizeMode="NoResize" 
         WindowStyle="SingleBorderWindow" Background="White" >
diff --git a/CompactGUI/Views/MainWindow.xaml.vb b/CompactGUI/Views/MainWindow.xaml.vb
index cace132..e7ecc2e 100644
--- a/CompactGUI/Views/MainWindow.xaml.vb
+++ b/CompactGUI/Views/MainWindow.xaml.vb
@@ -13,6 +13,8 @@ Class MainWindow
         Me.DataContext = ViewModel
 
         ViewModel.State = "FreshLaunch"
+
+
     End Sub
 
     Public Property ViewModel As New MainViewModel
@@ -58,4 +60,13 @@ Class MainWindow
 
 
     End Sub
+
+    Private Sub MainWindow_Loaded(sender As Object, e As RoutedEventArgs)
+
+        Me.Top = (SystemParameters.PrimaryScreenHeight - SettingsHandler.AppSettings.WindowHeight) / 2
+        Me.Left = (SystemParameters.PrimaryScreenWidth - SettingsHandler.AppSettings.WindowWidth) / 2
+
+        If Me.Top < 0 Then Me.Top = 0
+
+    End Sub
 End Class