diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 64c72ae52c..ad32175d84 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -1098,15 +1098,15 @@ void wxPropertyGrid::DoEndLabelEdit( bool commit, int selFlags )
         {
             cell = &prop->GetCell(labelColIdx);
         }
-        else
+        else if ( labelColIdx != 0 )
         {
-            if ( labelColIdx == 0 )
-                prop->SetLabel(text);
-            else
-                cell = &prop->GetOrCreateCell(labelColIdx);
+            cell = &prop->GetOrCreateCell(labelColIdx);
         }
 
-        if ( cell )
+       if ( labelColIdx == 0 )
+            prop->SetLabel(text);
+
+       if ( cell && cell->HasText() )
             cell->SetText(text);
     }