diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
index f6d5950a02..8fc5bccced 100644
--- a/src/msw/bmpcbox.cpp
+++ b/src/msw/bmpcbox.cpp
@@ -449,7 +449,12 @@ bool wxBitmapComboBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
     LPMEASUREITEMSTRUCT lpMeasureItem = (LPMEASUREITEMSTRUCT) item;
     int pos = lpMeasureItem->itemID;
 
-    lpMeasureItem->itemHeight = wxBitmapComboBoxBase::MeasureItem(pos);
+    // Measure item height if item list is not empty,
+    // otherwise leave default system value.
+    if ( pos >= 0 )
+    {
+        lpMeasureItem->itemHeight = wxBitmapComboBoxBase::MeasureItem(pos);
+    }
 
     return TRUE;
 }