diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 01af2f0d9e..5732bff03a 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1262,7 +1262,7 @@ void wxGrid::OnPaint( wxPaintEvent& ev )
 
 void wxGrid::OnSize( wxSizeEvent& ev )
 {
-    CalcDimensions();
+    if ( m_created ) CalcDimensions();
 }