diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index f0742876e20ed82e03fb1c1f00e7bdaa6055ba77..5d56a5dfa14442110e2a3c5eecddf2740864249c 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -52,6 +52,7 @@
 #include "llsidetray.h"
 #include "llpaneloutfitsinventory.h"
 #include "llfolderview.h"
+#include "llaccordionctrltab.h"
 
 #include <boost/scoped_ptr.hpp>
 
@@ -1312,9 +1313,17 @@ class LLAutoRenameFolder: public LLInventoryCallback
 		LLSideTray::getInstance()->showPanel("panel_outfits_inventory", key);
 		LLPanelOutfitsInventory *outfit_panel =
 			dynamic_cast<LLPanelOutfitsInventory*>(LLSideTray::getInstance()->getPanel("panel_outfits_inventory"));
-		outfit_panel->getRootFolder()->clearSelection();
-		outfit_panel->getRootFolder()->setSelectionByID(mFolderID, TRUE);
-		outfit_panel->getRootFolder()->setNeedsAutoRename(TRUE);
+		if (outfit_panel)
+		{
+			outfit_panel->getRootFolder()->clearSelection();
+			outfit_panel->getRootFolder()->setSelectionByID(mFolderID, TRUE);
+			outfit_panel->getRootFolder()->setNeedsAutoRename(TRUE);
+		}
+		LLAccordionCtrlTab* tab_outfits = outfit_panel ? outfit_panel->findChild<LLAccordionCtrlTab>("tab_outfits") : 0;
+		if (tab_outfits && !tab_outfits->getDisplayChildren())
+		{
+			tab_outfits->changeOpenClose(tab_outfits->getDisplayChildren());
+		}
 	}
 	
 	virtual void fire(const LLUUID&)