diff --git a/src/winapi_hooks.c b/src/winapi_hooks.c
index 8b6562a..e21815b 100644
--- a/src/winapi_hooks.c
+++ b/src/winapi_hooks.c
@@ -1357,6 +1357,13 @@ HWND WINAPI fake_CreateWindowExA(
         dwStyle |= WS_CLIPCHILDREN;
     }
 
+    /* Limit window size to max surface size (Dune2000 1.02) */
+    if (dwStyle & WS_POPUP)
+    {
+        nWidth = min((DWORD)nWidth, (DWORD)16384);
+        nHeight = min((DWORD)nHeight, (DWORD)16384);
+    }
+
     return real_CreateWindowExA(
         dwExStyle,
         lpClassName,