diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 18c1acac6c..01af2f0d9e 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -816,9 +816,10 @@ void wxGrid::Init()
     m_cellEditCtrlEnabled = TRUE;
     m_editCtrlType = wxGRID_TEXTCTRL;    
     
-    // Not really needed here, it gets called by OnSize()
+    // This is here in case OnSize does not get called when the grid is
+    // displayed
     //
-    // CalcDimensions();
+    CalcDimensions();
 }