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