SL-19823 Fix list view not focusing properly

1 files changed, 10 insertions, 7 deletions

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 7259ecf788..713ae21198 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -2425,14 +2425,17 @@ void LLPanelMainInventory::updateCombinationVisibility()
                 mCombinationListLayoutPanel->setShape(list_latout, true /*tell stack to account for new shape*/);
             }
         }
+    }
 
-        if (mCombInvUUIDNeedsRename.notNull() && mCombinationInventoryPanel->areViewsInitialized())
-        {
-            mCombinationInventoryPanel->setSelectionByID(mCombInvUUIDNeedsRename, TRUE);
-            mCombinationInventoryPanel->getRootFolder()->scrollToShowSelection();
-            mCombinationInventoryPanel->getRootFolder()->setNeedsAutoRename(TRUE);
-            mCombInvUUIDNeedsRename.setNull();
-        }
+    if (mSingleFolderMode
+        && !isGalleryViewMode()
+        && mCombInvUUIDNeedsRename.notNull()
+        && mCombinationInventoryPanel->areViewsInitialized())
+    {
+        mCombinationInventoryPanel->setSelectionByID(mCombInvUUIDNeedsRename, TRUE);
+        mCombinationInventoryPanel->getRootFolder()->scrollToShowSelection();
+        mCombinationInventoryPanel->getRootFolder()->setNeedsAutoRename(TRUE);
+        mCombInvUUIDNeedsRename.setNull();
     }
 }