diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index fd23b375fab6d65caa708214746a70cc9ab6f744..fd8372963019c024e41879ef34c255194d2b2010 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -192,6 +192,7 @@ class LLInventoryPanel : public LLPanel
 	//--------------------------------------------------------------------
 public:
 	BOOL 				getIsViewsInitialized() const { return mViewsInitialized; }
+	const LLUUID&		getStartFolderID() const { return mStartFolderID; }
 private:
 	// Builds the UI.  Call this once the inventory is usable.
 	void 				initializeViews();
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index e24fa14e1e94f3662e82870071ce1d28d4d36a86..003241e98ebfe17c023bd0a78fda8585312e7a05 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -264,11 +264,14 @@ void LLLandmarksPanel::updateFilteredAccordions()
 		accordion_tab = *iter;
 		inventory_list = dynamic_cast<LLInventorySubTreePanel*> (accordion_tab->getAccordionView());
 		if (NULL == inventory_list) continue;
+		// This doesn't seem to work correctly.  Disabling for now. -Seraph
+		/*
 		LLFolderView* fv = inventory_list->getRootFolder();
-
 		bool has_descendants = fv->hasFilteredDescendants();
 
 		accordion_tab->setVisible(has_descendants);
+		*/
+		accordion_tab->setVisible(TRUE);
 	}
 
 	// we have to arrange accordion tabs for cases when filter string is less restrictive but
@@ -457,6 +460,19 @@ void LLLandmarksPanel::onAccordionExpandedCollapsed(const LLSD& param, LLInvento
 		mCurrentSelectedList = NULL;
 		updateVerbs();
 	}
+
+	// Start background fetch, mostly for My Inventory and Library
+	if (expanded)
+	{
+		const LLUUID &cat_id = inventory_list->getStartFolderID();
+		// Just because the category itself has been fetched, doesn't mean its child folders have.
+		/*
+		  if (!gInventory.isCategoryComplete(cat_id))
+		*/
+		{
+			gInventory.startBackgroundFetch(cat_id);
+		}
+	}
 }
 
 void LLLandmarksPanel::deselectOtherThan(const LLInventorySubTreePanel* inventory_list)