diff --git a/src/common/bmpcboxcmn.cpp b/src/common/bmpcboxcmn.cpp
index 7fc297982a..3b29913b60 100644
--- a/src/common/bmpcboxcmn.cpp
+++ b/src/common/bmpcboxcmn.cpp
@@ -67,8 +67,15 @@ void wxBitmapComboBoxBase::UpdateInternals()
     while ( m_bitmapbundles.size() < GetItemContainer()->GetCount() )
         m_bitmapbundles.push_back( wxBitmapBundle() );
 
-    if ( m_usedImgSize.x != -1 && m_bitmapbundles.size() > 0 )
-        m_usedImgSize = m_bitmapbundles[0].GetPreferredLogicalSizeFor(GetControl());
+    if ( m_usedImgSize.x != -1 )
+    {
+        m_usedImgSize = wxBitmapBundle::GetConsensusSizeFor
+                        (
+                            GetControl(),
+                            m_bitmapbundles,
+                            wxSize(0, 0)
+                        );
+    }
 }
 
 // ----------------------------------------------------------------------------