diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index c7d699f1f1..c95b381460 100644
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -758,6 +758,11 @@ wxSize wxVListBoxComboPopup::GetAdjustedSize( int minWidth, int prefHeight, int
             height = maxHeight;
 
         int totalHeight = GetTotalHeight(); // + 3;
+
+#if defined(__WXMAC__)
+        // Take borders into account, or there will be scrollbars even for one or two items.
+        totalHeight += 2;
+#endif
         if ( height >= totalHeight )
         {
             height = totalHeight;