diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
index 469ddace63..7cf13208b6 100644
--- a/src/msw/bmpcbox.cpp
+++ b/src/msw/bmpcbox.cpp
@@ -449,9 +449,9 @@ bool wxBitmapComboBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
     LPMEASUREITEMSTRUCT lpMeasureItem = (LPMEASUREITEMSTRUCT) item;
     int pos = lpMeasureItem->itemID;
 
-    // Measure item height if item list is not empty,
+    // Measure edit field height if item list is not empty,
     // otherwise leave default system value.
-    if ( pos >= 0 )
+    if ( m_usedImgSize.y >= 0 || pos >= 0 )
     {
         lpMeasureItem->itemHeight = wxBitmapComboBoxBase::MeasureItem(pos);
     }