diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp
index 7b38a37562..ef8b03a752 100644
--- a/src/propgrid/propgridpagestate.cpp
+++ b/src/propgrid/propgridpagestate.cpp
@@ -1705,9 +1705,11 @@ wxPGProperty* wxPropertyGridPageState::DoInsert( wxPGProperty* parent, int index
         else if ( parentIsRoot )
             // Parent is root.
             m_regularArray.DoAddChild( property, -1, false );
+        else
+            parent->DoAddChild(property, index, true);
 
         // Add to current mode
-        if ( !property->IsCategory() )
+        if ( !property->IsCategory() && (parentIsCategory || parentIsRoot) )
             m_abcArray->DoAddChild( property, index, true );
     }