diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 7bdc51d985..0bd991cabc 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -2608,8 +2608,7 @@ void wxPropertyGrid::DrawItemAndValueRelated( wxPGProperty* p )
     wxPGProperty* parent = p->GetParent();
 
     while ( parent &&
-            !parent->IsCategory() &&
-            parent->GetParent() )
+            !parent->IsCategory() && !parent->IsRoot() )
     {
          DrawItem(parent);
          parent = parent->GetParent();