diff --git a/src/kits/interface/ListView.cpp b/src/kits/interface/ListView.cpp
index 3014e15a76..fdaf5f580e 100644
--- a/src/kits/interface/ListView.cpp
+++ b/src/kits/interface/ListView.cpp
@@ -326,7 +326,8 @@ BListView::MouseDown(BPoint point)
 	
 	if (timeDelta < doubleClickSpeed
 		&& fabs(delta.x) < kDoubleClickTresh
-		&& fabs(delta.y) < kDoubleClickTresh)
+		&& fabs(delta.y) < kDoubleClickTresh
+		&& fTrack->last_index == index)
 		doubleClick = true;
 	
 	if (doubleClick && index >= fFirstSelected && index <= fLastSelected) {