diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 101e6cf372..13ad0909b8 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -3879,6 +3879,10 @@ void wxGrid::CalcDimensions()
     SetScrollbars( GRID_SCROLL_LINE_X, GRID_SCROLL_LINE_Y,
                    GetScrollX(w), GetScrollY(h), x, y,
                    GetBatchCount() != 0);
+
+    // if our OnSize() hadn't been called (it would if we have scrollbars), we
+    // still must reposition the children
+    CalcWindowSizes();
 }