diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h
index e60002a638..48e0e21dbe 100644
--- a/interface/wx/propgrid/property.h
+++ b/interface/wx/propgrid/property.h
@@ -1147,16 +1147,17 @@ public:
 
         NOTE: Following applies when OnMeasureImage() returns a "flexible" height (
         using wxPG_FLEXIBLE_SIZE(W,H) macro), which implies variable height items:
-        If rect.x is < 0, then this is a measure item call, which means that
-        dc is invalid and only thing that should be done is to set paintdata.m_drawnHeight
-        to the height of the image of item at index paintdata.m_choiceItem. This call
-        may be done even as often as once every drop-down popup show.
+        If (rect.x+rect.width) is < 0, then this is a measure item call, which
+        means that dc is invalid and only thing that should be done is to set
+        paintdata.m_drawnHeight to the height of the image of item at index
+        paintdata.m_choiceItem. This call may be done even as often as once every
+        drop-down popup show.
 
         @param dc
         wxDC to paint on.
         @param rect
         Box reserved for custom graphics. Includes surrounding rectangle, if any.
-        If x is < 0, then this is a measure item call (see above).
+        If x+width is < 0, then this is a measure item call (see above).
         @param paintdata
         wxPGPaintData structure with much useful data about painted item.
         @code
diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index 160004b02f..b4dc593346 100644
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -797,7 +797,7 @@ void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb,
         cis = GetImageSize(p, item);
     }
 
-    if ( rect.x < 0 )
+    if ( rect.x + rect.width < 0 )
     {
         // Default measure behaviour (no flexible, custom paint image only)
         if ( rect.width < 0 )