diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 271cc3e037eca57ec96187a2afb94837547632e0..75df5c10439f929b1d97454ee75b1072bf2155af 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1261,7 +1261,7 @@ void LLInventoryGallery::onFocusReceived()
         focus_item->setSelected(true);
         focus_item->setFocus(TRUE);
     }
-    else if (mIndexToItemMap.size() > 0)
+    else if (mIndexToItemMap.size() > 0 && mItemToSelect.isNull())
     {
         // choose any items from visible rect
         S32 vert_offset = mScrollPanel->getDocPosVertical();