diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 0de3169972..84d734858a 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -63,6 +63,7 @@ public:
 		I18NCategory *category, ScreenManager *screenManager, LayoutParams *layoutParams = 0)
 		: Choice(text, "", false, layoutParams), value_(value), choices_(choices), minVal_(minVal), numChoices_(numChoices), 
 		category_(category), screenManager_(screenManager) {
+		if (*value >= numChoices+minVal) *value = numChoices+minVal-1;
 		if (*value < minVal) *value = minVal;
 		OnClick.Handle(this, &PopupMultiChoice::HandleClick);
 		UpdateText();