diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp
index 3a7f4b7c9..b92efcee0 100644
--- a/src/gui/keybind_setup.cpp
+++ b/src/gui/keybind_setup.cpp
@@ -248,8 +248,12 @@ int CKeybindSetup::showKeySetup()
 	cc->setHint("", LOCALE_MENU_HINT_KEY_REPEATBLOCK);
 	keySettings->addItem(cc);
 
+	std::string ms_number_format("%d ");
+	ms_number_format += g_Locale->getText(LOCALE_UNIT_SHORT_MILLISECOND);
 	cc = new CMenuOptionNumberChooser(LOCALE_KEYBINDINGMENU_REPEATBLOCKGENERIC,
 		&g_settings.repeat_genericblocker, true, 0, 999);
+	cc->setNumberFormat(ms_number_format);
+	cc->setNumberFormat(ms_number_format);
 	cc->setHint("", LOCALE_MENU_HINT_KEY_REPEATBLOCKGENERIC);
 	keySettings->addItem(cc);