diff --git a/docs/changes.txt b/docs/changes.txt
index fd4347b09d..91c1eedd35 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -100,6 +100,8 @@ wxMSW:
 
 - wxOwnerDrawnComboBox and wxComboCtrl with wxCB_READONLY window style now
   have more native-like focus indicator rendering.
+- Fixed wxOwnerDrawnComboBox keyboard handling: drop-down is no longer
+  displayed when arrow key is pressed (without Alt).
 
 2.8.11:
 -------
diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index 13f9d2998b..fa8e032d4c 100644
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -900,19 +900,11 @@ bool wxComboCtrl::IsKeyPopupToggle(const wxKeyEvent& event) const
 
         case WXK_DOWN:
         case WXK_UP:
-            // On XP or with writable combo in Classic, arrows don't open the
-            // popup but Alt-arrow does
-            if ( event.AltDown() ||
-                    ( !isPopupShown &&
-                      HasFlag(wxCB_READONLY)
-#if wxUSE_UXTHEME
-                      &&
-                      !wxUxThemeEngine::GetIfActive()
-#endif
-                    ) )
-            {
+        case WXK_NUMPAD_DOWN:
+        case WXK_NUMPAD_UP:
+            // Alt plus arrow key toggles the popup in the native combo box
+            if ( event.AltDown() )
                 return true;
-            }
             break;
     }