diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 63b5099321..7e6628c825 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -1297,8 +1297,10 @@ void wxPropertyGrid::CalculateFontAndBitmapStuff( int vspacing )
 
 void wxPropertyGrid::OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) )
 {
-    RegainColours();
-    Refresh();
+    if ((m_iFlags & wxPG_FL_INITIALIZED)!=0) {
+        RegainColours();
+        Refresh();
+    }
 }
 
 // -----------------------------------------------------------------------