diff --git a/src/kits/interface/ListView.cpp b/src/kits/interface/ListView.cpp
index 4007a09f00..8e0974f10c 100644
--- a/src/kits/interface/ListView.cpp
+++ b/src/kits/interface/ListView.cpp
@@ -1022,7 +1022,10 @@ BListView::ScrollToSelection()
 	if (Bounds().Contains(itemFrame))
 		return;
 
-	ScrollTo(itemFrame.left, itemFrame.top);
+	if (itemFrame.top < Bounds().top)
+		ScrollTo(itemFrame.left, itemFrame.top);
+	else
+		ScrollTo(itemFrame.left, itemFrame.bottom - Bounds().Height());
 }