diff --git a/imgui.cpp b/imgui.cpp
index 7711f26..a171679 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -5841,6 +5841,7 @@
                 size = ImFloor(settings->Size);
         }
     window->Size = window->SizeFull = window->SizeFullAtLastBegin = size;
+    window->DC.CursorMaxPos = window->Pos; // So first call to CalcSizeContents() doesn't return crazy values
 
     if ((flags & ImGuiWindowFlags_AlwaysAutoResize) != 0)
     {