diff --git a/src/apps/firstbootprompt/BootPromptWindow.cpp b/src/apps/firstbootprompt/BootPromptWindow.cpp
index 9576561004..b64b57247c 100644
--- a/src/apps/firstbootprompt/BootPromptWindow.cpp
+++ b/src/apps/firstbootprompt/BootPromptWindow.cpp
@@ -63,7 +63,7 @@ static const char* kLanguageKeymapMappings[] = {
 	"Dutch", "US-International"
 };
 static const size_t kLanguageKeymapMappingsSize
-	 = sizeof(kLanguageKeymapMappings) / sizeof(kLanguageKeymapMappings[0]);
+	= sizeof(kLanguageKeymapMappings) / sizeof(kLanguageKeymapMappings[0]);
 
 
 class LanguageItem : public BStringItem {
@@ -215,6 +215,8 @@ BootPromptWindow::BootPromptWindow()
 		.View()
 	);
 
+	fLanguagesListView->MakeFocus();
+
 	_UpdateStrings();
 	CenterOnScreen();
 	Show();