diff --git a/docs/changes.txt b/docs/changes.txt
index 1f282ab117..e71268c6a4 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -582,6 +582,10 @@ wxGTK:
 
 - Fix mouse wheel scrolling in wxListCtrl broken just before 3.0.0.
 
+wxMSW:
+
+- Fix blank wxBitmapComboBox dropdown appearance.
+
 
 3.0.0: (released 2013-11-11)
 ----------------------------
diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 24f187036f..c4f0cb36b0 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -683,7 +683,7 @@ wxWindow *wxComboBox::MSWFindItem(long id, WXHWND hWnd) const
     // our own one. So we must explicitly check the HWND value too here and
     // avoid eating the events from the listbox as otherwise it is rendered
     // inoperative, see #15647.
-    if ( id == GetId() && hWnd != GetHWND() )
+    if ( id == GetId() && hWnd && hWnd != GetHWND() )
     {
         // Must be the case described above.
         return NULL;