diff --git a/Fluent/Internal/WindowSizing.cs b/Fluent/Internal/WindowSizing.cs
index 469ebf9b1..8ad0cd374 100644
--- a/Fluent/Internal/WindowSizing.cs
+++ b/Fluent/Internal/WindowSizing.cs
@@ -182,8 +182,11 @@ private MINMAXINFO GetMinMaxInfo(IntPtr hwnd, MINMAXINFO mmi)
 
             var x = ignoreTaskBar ? monitorInfo.rcMonitor.left : monitorInfo.rcWork.left;
             var y = ignoreTaskBar ? monitorInfo.rcMonitor.top : monitorInfo.rcWork.top;
-            mmi.ptMaxSize.X = ignoreTaskBar ? Math.Abs(monitorInfo.rcMonitor.right - x) : Math.Abs(monitorInfo.rcWork.right - x);
-            mmi.ptMaxSize.Y = ignoreTaskBar ? Math.Abs(monitorInfo.rcMonitor.bottom - y) : Math.Abs(monitorInfo.rcWork.bottom - y);
+            var maxWidth = ignoreTaskBar ? Math.Abs(monitorInfo.rcMonitor.right - x) : Math.Abs(monitorInfo.rcWork.right - x);
+            var maxHeight = ignoreTaskBar ? Math.Abs(monitorInfo.rcMonitor.bottom - y) : Math.Abs(monitorInfo.rcWork.bottom - y);
+
+            mmi.ptMaxSize.X = Math.Min(maxWidth, (int)this.window.MaxWidth);
+            mmi.ptMaxSize.Y = Math.Min(maxHeight, (int)this.window.MaxHeight);
 
             if (!ignoreTaskBar)
             {