diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index be19331e80..25483ca765 100644
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -340,7 +340,7 @@ bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent),
                    hButton +            // button(s)
                    LAYOUT_Y_MARGIN;     // bottom margin
 
-    long wDialog = wxMax(wTotalButtons, widthTextMax) +
+    long wDialog = wxMax(wListbox, wxMax(wTotalButtons, widthTextMax)) +
                    4*LAYOUT_X_MARGIN;   // 2 from each side
 
     // create the controls