diff --git a/NAPS2.Lib/EtoForms/Layout/LayoutController.cs b/NAPS2.Lib/EtoForms/Layout/LayoutController.cs
index ed608e340e..25ecbc5847 100644
--- a/NAPS2.Lib/EtoForms/Layout/LayoutController.cs
+++ b/NAPS2.Lib/EtoForms/Layout/LayoutController.cs
@@ -41,9 +41,22 @@ public void Bind(Window window)
         window.Content = _layout;
         window.LoadComplete += (_, _) =>
         {
-            _isShown = true;
+            if (window is not Form)
+            {
+                // For dialogs loading is equivalent to being shown
+                _isShown = true;
+            }
             DoLayout();
         };
+        window.Shown += (_, _) =>
+        {
+            // For forms, it's possible they might be maximized between LoadComplete and Shown so we need to relayout
+            if (window is Form)
+            {
+                _isShown = true;
+                DoLayout();
+            }
+        };
         window.SizeChanged += (_, _) => DoLayout();
     }