diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index a7e901cbfa8518748d7a77b6407402e41b78b8f3..dca2465ebc93735c0ea6709f534531ab752053c9 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -331,6 +331,8 @@ BOOL LLPanelOutfitEdit::postBuild()
 	childSetCommitCallback("shop_btn_1", boost::bind(&LLPanelOutfitEdit::onShopButtonClicked, this), NULL);
 	childSetCommitCallback("shop_btn_2", boost::bind(&LLPanelOutfitEdit::onShopButtonClicked, this), NULL);
 
+	setVisibleCallback(boost::bind(&LLPanelOutfitEdit::onVisibilityChange, this));
+
 	mCOFWearables = getChild<LLCOFWearables>("cof_wearables_list");
 	mCOFWearables->setCommitCallback(boost::bind(&LLPanelOutfitEdit::filterWearablesBySelectedItem, this));
 
@@ -405,10 +407,6 @@ void LLPanelOutfitEdit::onOpen(const LLSD& key)
 		displayCurrentOutfit();
 		mInitialized = true;
 	}
-
-	showAddWearablesPanel(false);
-	mWearableItemsList->resetSelection();
-	mInventoryItemsPanel->clearSelection();
 }
 
 void LLPanelOutfitEdit::moveWearable(bool closer_to_body)
@@ -578,6 +576,13 @@ void LLPanelOutfitEdit::onPlusBtnClicked(void)
 	LLAppearanceMgr::getInstance()->wearItemOnAvatar(selected_id, true, true);
 }
 
+void LLPanelOutfitEdit::onVisibilityChange()
+{
+	showAddWearablesPanel(false);
+	mWearableItemsList->resetSelection();
+	mInventoryItemsPanel->clearSelection();
+}
+
 void LLPanelOutfitEdit::onAddWearableClicked(void)
 {
 	LLPanelDummyClothingListItem* item = dynamic_cast<LLPanelDummyClothingListItem*>(mCOFWearables->getSelectedItem());
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h
index de1bf87fb32fb0c1353267e0f28ceb467e403a9a..fb9a35411c90bc3e74a08f248dbf139319404b7d 100644
--- a/indra/newview/llpaneloutfitedit.h
+++ b/indra/newview/llpaneloutfitedit.h
@@ -148,6 +148,8 @@ class LLPanelOutfitEdit : public LLPanel
 	void onInventorySelectionChange();
 	void onPlusBtnClicked(void);
 
+	void onVisibilityChange();
+
 	void applyFolderViewFilter(EFolderViewItemType type);
 	void applyListViewFilter(EListViewItemType type);