diff --git a/aegisub/src/preferences_base.cpp b/aegisub/src/preferences_base.cpp
index 75ffff755..3b66052ea 100644
--- a/aegisub/src/preferences_base.cpp
+++ b/aegisub/src/preferences_base.cpp
@@ -170,7 +170,8 @@ void OptionPage::OptionChoice(wxFlexGridSizer *&flex, const wxString &name, cons
 
 	switch (opt->GetType()) {
 		case agi::OptionValue::Type_Int: {
-			cb->SetValue(choices[opt->GetInt()]);
+			int val = opt->GetInt();
+			cb->SetValue(choices[val < (int)choices.size() ? val : opt->GetDefaultInt()]);
 			cb->Bind(wxEVT_COMMAND_COMBOBOX_SELECTED, IntCBUpdater(opt_name, parent));
 			break;
 		}