diff --git a/src/apps/readonlybootprompt/BootPromptWindow.cpp b/src/apps/readonlybootprompt/BootPromptWindow.cpp
index 054c016825..a2d93669b9 100644
--- a/src/apps/readonlybootprompt/BootPromptWindow.cpp
+++ b/src/apps/readonlybootprompt/BootPromptWindow.cpp
@@ -130,12 +130,16 @@ BootPromptWindow::BootPromptWindow()
 		)
 	);
 
-	// This call in the first _PopulateKeymaps had no effect yet, since the
-	// list wasn't attatched to the window yet.
-	fKeymapsListView->ScrollToSelection();
-
 	CenterOnScreen();
 	Show();
+	Lock();
+
+	// This call in the first _PopulateLanguages/Keymaps had no effect yet,
+	// since the list wasn't attached to the window yet.
+	fLanguagesListView->ScrollToSelection();
+	fKeymapsListView->ScrollToSelection();
+
+	Unlock();
 }
 
 
@@ -295,6 +299,8 @@ BootPromptWindow::_PopulateLanguages()
 			printf("failed to get BLanguage for %s\n", languageString);
 	}
 
+	fLanguagesListView->ScrollToSelection();
+
 	// Re-enable sending the selection message.
 	fLanguagesListView->SetSelectionMessage(
 		new BMessage(MSG_LANGUAGE_SELECTED));