diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 4b4b316734..e57a9406ce 100644
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -264,6 +264,10 @@ void wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,
             {
                 text = vInlineHelp.GetString();
                 dc.SetTextForeground(propertyGrid->GetCellDisabledTextColour());
+
+                // Must make the editor NULL to override it's own rendering
+                // code.
+                editor = NULL;
             }
         }
     }