diff --git a/src/preferences/screensaver/ScreenSaverWindow.cpp b/src/preferences/screensaver/ScreenSaverWindow.cpp
index 4d4303cc1a..2bd834dcd0 100644
--- a/src/preferences/screensaver/ScreenSaverWindow.cpp
+++ b/src/preferences/screensaver/ScreenSaverWindow.cpp
@@ -583,6 +583,8 @@ ModulesView::DetachedFromWindow()
 void
 ModulesView::AttachedToWindow()
 {
+	PopulateScreenSaverList();
+
 	fScreenSaversListView->SetTarget(this);
 	fTestButton->SetTarget(this);
 	fAddButton->SetTarget(this);
@@ -592,7 +594,8 @@ ModulesView::AttachedToWindow()
 void
 ModulesView::AllAttached()
 {
-	PopulateScreenSaverList();
+	fScreenSaversListView->ScrollToSelection();
+		// This only works after the list view is attached
 	fScreenSaversListView->Invoke(new BMessage(kMsgSaverSelected));
 }