diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index 3838f50c48..b68ad2d097 100644
--- a/src/univ/radiobox.cpp
+++ b/src/univ/radiobox.cpp
@@ -162,8 +162,10 @@ bool wxRadioBox::Create(wxWindow *parent,
     wxSize actualSize = GetSize();
     DoMoveWindow(actualPos.x, actualPos.y, actualSize.x, actualSize.y);
 
-    // radiobox should already have selection so select at least one item
-    SetSelection(0);
+    // Select first radio button if we have any buttons at all, as the radiobox
+    // should always have some selection.
+    if ( n != 0 )
+        SetSelection(0);
 
     return true;
 }