diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index f1d4dcec04..ef5c9f790e 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -165,8 +165,8 @@ void LLOutfitsList::updateAddedCategory(LLUUID cat_id)
     tab->setDisplayChildren(false);
 
     // <FS:ND> Calling this when there's a lot of outfits causes horrible perfomance and disconnects, due to arrange eating so many cpu cycles.
-     mAccordion->addCollapsibleCtrl(tab);
-    //mAccordion->addCollapsibleCtrl(tab, false);
+    //mAccordion->addCollapsibleCtrl(tab);
+    mAccordion->addCollapsibleCtrl(tab, false);
     // </FS:ND>
 
     // Start observing the new outfit category.
@@ -928,7 +928,7 @@ void LLOutfitListBase::refreshList(const LLUUID& category_id)
     }
 
     // <FS:ND> We called mAccordion->addCollapsibleCtrl with false as second paramter and did not let it arrange itself each time. Do this here after all is said and done.
-    //arrange();
+    arrange();
 
     // Handle removed tabs.
     for (uuid_vec_t::const_iterator iter = vremoved.begin(); iter != vremoved.end(); ++iter)
diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp
index 0d8134ddaf..b131b6db15 100644
--- a/indra/newview/llpaneloutfitsinventory.cpp
+++ b/indra/newview/llpaneloutfitsinventory.cpp
@@ -103,8 +103,9 @@ BOOL LLPanelOutfitsInventory::postBuild()
 	
 	mSaveComboBtn.reset(new LLSaveOutfitComboBtn(this, true));
 
-	if (!mAppearanceTabs->selectTab(gSavedSettings.getS32("LastAppearanceTab")))
-		mAppearanceTabs->selectFirstTab();
+	// <FS:Ansariel> FIRE-20180: Select last tab when actually opening the appearance floater for the first time
+	//if (!mAppearanceTabs->selectTab(gSavedSettings.getS32("LastAppearanceTab")))
+	//	mAppearanceTabs->selectFirstTab();
 
 	return TRUE;
 }
@@ -128,6 +129,10 @@ void LLPanelOutfitsInventory::onOpen(const LLSD& key)
 		onCOFChanged();
 		// </FS:Ansariel>
 
+		// <FS:Ansariel> FIRE-20180: Select last tab when actually opening the appearance floater for the first time
+		if (!mAppearanceTabs->selectTab(gSavedSettings.getS32("LastAppearanceTab")))
+			mAppearanceTabs->selectFirstTab();
+
 		mInitialized = true;
 	}