diff --git a/ShiftOS.WinForms/WindowBorder.cs b/ShiftOS.WinForms/WindowBorder.cs
index e056350..efb3f98 100644
--- a/ShiftOS.WinForms/WindowBorder.cs
+++ b/ShiftOS.WinForms/WindowBorder.cs
@@ -231,10 +231,7 @@ namespace ShiftOS.WinForms
             this.DoubleBuffered = true;
             this.Left = (Screen.PrimaryScreen.Bounds.Width - this.Width) / 2;
             this.Top = (Screen.PrimaryScreen.Bounds.Height - this.Height) / 2;
-            ParentWindow.OnLoad();
-            ParentWindow.OnSkinLoad();
-            ParentWindow.OnUpgrade();
-
+            
         }
 
         /// <summary>
diff --git a/ShiftOS.WinForms/WinformsWindowManager.cs b/ShiftOS.WinForms/WinformsWindowManager.cs
index 8bff387..a224f08 100644
--- a/ShiftOS.WinForms/WinformsWindowManager.cs
+++ b/ShiftOS.WinForms/WinformsWindowManager.cs
@@ -121,6 +121,10 @@ namespace ShiftOS.WinForms
             wb.IsDialog = true;
 
             Desktop.ShowWindow(wb);
+            form.OnLoad();
+            form.OnSkinLoad();
+            form.OnUpgrade();
+
         }
 
         public override void SetupWindow(IShiftOSWindow form)
@@ -208,6 +212,10 @@ namespace ShiftOS.WinForms
             wb.FormClosed += onClose;
             Desktop.ShowWindow(wb);
             SetupWindows();
+            form.OnLoad();
+            form.OnSkinLoad();
+            form.OnUpgrade();
+
         }
 
         public void SetupWindows()