diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp
index 272189fd62..d36a92ca31 100644
--- a/src/apps/drivesetup/MainWindow.cpp
+++ b/src/apps/drivesetup/MainWindow.cpp
@@ -566,7 +566,7 @@ MainWindow::_ScanDrives()
 	PartitionListRow* previousSelection
 		= fListView->FindRow(fCurrentPartitionID);
 	if (previousSelection) {
-		fListView->AddToSelection(previousSelection);
+		fListView->SetFocusRow(previousSelection, true);
 		_UpdateMenus(fCurrentDisk, fCurrentPartitionID,
 			previousSelection->ParentID());
 		fDiskView->ForceUpdate();