diff --git a/src/osx/cocoa/combobox.mm b/src/osx/cocoa/combobox.mm
index 71aa165d44..56e6602a62 100644
--- a/src/osx/cocoa/combobox.mm
+++ b/src/osx/cocoa/combobox.mm
@@ -20,6 +20,7 @@
     #include "wx/dcclient.h"
 #endif
 
+#include "wx/osx/private/available.h"
 #include "wx/osx/cocoa/private/textimpl.h"
 
 // work in progress
@@ -347,7 +348,10 @@ wxWidgetImplType* wxWidgetImpl::CreateComboBox( wxComboBox* wxpeer,
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSComboBox* v = [[wxNSComboBox alloc] initWithFrame:r];
-    [v setNumberOfVisibleItems:13];
+    if (WX_IS_MACOS_AVAILABLE(10, 13))
+        [v setNumberOfVisibleItems:999];
+    else
+        [v setNumberOfVisibleItems:13];
     if (style & wxCB_READONLY)
         [v setEditable:NO];
     wxNSComboBoxControl* c = new wxNSComboBoxControl( wxpeer, v );