diff --git a/src/kits/interface/ListView.cpp b/src/kits/interface/ListView.cpp
index 2705fb4922..bc8f091f1c 100644
--- a/src/kits/interface/ListView.cpp
+++ b/src/kits/interface/ListView.cpp
@@ -537,6 +537,14 @@ BListView::MouseDown(BPoint where)
 	BMessage* message = Looper()->CurrentMessage();
 	int32 index = IndexOf(where);
 
+	int32 buttons = 0;
+	if (message != NULL)
+		message->FindInt32("buttons", &buttons);
+
+	int32 modifiers = 0;
+	if (message != NULL)
+		message->FindInt32("modifiers", &modifiers);
+
 	// If the user double (or more) clicked within the current selection,
 	// we don't change the selection but invoke the selection.
 	// TODO: move this code someplace where it can be shared everywhere
@@ -563,9 +571,6 @@ BListView::MouseDown(BPoint where)
 		return;
 	}
 
-	int32 modifiers;
-	message->FindInt32("modifiers", &modifiers);
-
 	if (!doubleClick) {
 		fTrack->drag_start = where;
 		fTrack->last_click_time = system_time();