diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index 26a03e922a69c660e6ec8d7fe164d0031fbca088..ddfb0f85347be80c69b8893c1fadb47a7c94f439 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -484,6 +484,8 @@ void LLFlatListView::rearrangeItems()
 void LLFlatListView::onItemMouseClick(item_pair_t* item_pair, MASK mask)
 {
 	if (!item_pair) return;
+
+	setFocus(TRUE);
 	
 	bool select_item = !isSelected(item_pair);
 
@@ -654,8 +656,6 @@ bool LLFlatListView::selectItemPair(item_pair_t* item_pair, bool select)
 		onCommit();
 	}
 
-	setFocus(TRUE);
-
 	// Stretch selected items rect to ensure it won't be clipped
 	mSelectedItemsBorder->setRect(getSelectedItemsRect().stretch(-1));