1 files changed, 11 insertions, 4 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 2816a2dc89..e60ee20210 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -482,11 +482,18 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
 	reset_inventory_filter();
     if(mSingleFolderMode)
     {
-        LLFolderViewItem* current_folder = getActivePanel()->getRootFolder();
-        if (current_folder)
+        if(isListViewMode())
+        {
+            LLFolderViewItem* current_folder = getActivePanel()->getRootFolder();
+            if (current_folder)
+            {
+                LLFolderBridge* bridge = (LLFolderBridge*)current_folder->getViewModelItem();
+                menu_create_inventory_item(getPanel(), bridge, userdata);
+            }
+        }
+        else if(isGalleryViewMode())
         {
-            LLFolderBridge* bridge = (LLFolderBridge*)current_folder->getViewModelItem();
-            menu_create_inventory_item(getPanel(), bridge, userdata);
+            menu_create_inventory_item(NULL, mInventoryGalleryPanel->getRootFolder(), userdata);
         }
     }
     else