diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 630cb59b8b..227015e720 100644
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -234,7 +234,7 @@ void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
 
 wxSize wxChoice::DoGetBestSize() const
 {
-    int lbWidth = 100;  // some defaults
+    int lbWidth = GetCount() > 0 ? 20 : 100;  // some defaults
     int lbHeight = 20;
     int wLine;
 #if TARGET_CARBON
diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index 630cb59b8b..227015e720 100644
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -234,7 +234,7 @@ void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
 
 wxSize wxChoice::DoGetBestSize() const
 {
-    int lbWidth = 100;  // some defaults
+    int lbWidth = GetCount() > 0 ? 20 : 100;  // some defaults
     int lbHeight = 20;
     int wLine;
 #if TARGET_CARBON