diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index e4e3d33de1..639b71991c 100644
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -634,6 +634,8 @@ bool wxPropertyGridManager::Create( wxWindow *parent,
     Init2(style);
 
     SetInitialSize(size);
+    // Create controls
+    RecreateControls();
 
     return res;
 }
@@ -763,9 +765,6 @@ void wxPropertyGridManager::Init2( int style )
     //     (see wxPropertyGridManager::ProcessEvent).
     ReconnectEventHandlers(wxID_NONE, m_pPropGrid->GetId());
 
-    // Optional initial controls.
-    m_width = -12345;
-
     m_iFlags |= wxPG_MAN_FL_INITIALIZED;
 
 }
@@ -2149,9 +2148,6 @@ void wxPropertyGridManager::OnResize( wxSizeEvent& WXUNUSED(event) )
 
     GetClientSize(&width, &height);
 
-    if ( m_width == -12345 )
-        RecreateControls();
-
     RecalculatePositions(width, height);
 
     if ( m_pPropGrid && m_pPropGrid->GetParent() )