diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index bcce43a4d1..4bd4629552 100644
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -588,7 +588,7 @@ wxSize wxChoice::DoGetBestSize() const
     }
 
     // but not less than the minimal width
-    if ( ret.x < 80 )
+    if ( GetCount() == 0 && ret.x < 80 )
         ret.x = 80;
 
     // If this request_size is called with no entries then
diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index ba38afe937..bf52e0dde5 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -1365,7 +1365,7 @@ wxSize wxComboBox::DoGetBestSize() const
     }
 
     // empty combobox should have some reasonable default size too
-    if ( ret.x < 100 )
+    if ( GetCount() == 0 && ret.x < 100 )
         ret.x = 100;
 
     CacheBestSize(ret);