diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp
index b6ae97e834..26a8aa8eea 100644
--- a/indra/newview/llpaneloutfitsinventory.cpp
+++ b/indra/newview/llpaneloutfitsinventory.cpp
@@ -429,7 +429,10 @@ void LLPanelOutfitsInventory::onTabChange()
     }
     if (mTrashMenuPanel)
     {
-        mTrashMenuPanel->setVisible(mActivePanel->getTrashMenuVisible());
+        // <FS:PP> FIRE-35947 Ensure the top menu buttons (gear/sort/trash) are only visible in the outfits panel
+        // mTrashMenuPanel->setVisible(mActivePanel->getTrashMenuVisible());
+        mTrashMenuPanel->setVisible(false);
+        // </FS:PP>
     }
 
     updateVerbs();
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index 5aa420ff5c..5386766379 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -366,9 +366,9 @@ void LLSidepanelAppearance::toggleMyOutfitsPanel(bool visible, const std::string
     mCurrOutfitPanel->setVisible(visible);
 
     // <FS:PP> FIRE-35947 Ensure the top menu buttons (gear/sort/trash) are only visible in the outfits panel
-    getChildView("options_gear_btn_panel")->setVisible(visible);
+    getChildView("options_gear_btn_panel")->setVisible(false);
     getChildView("options_sort_btn_panel")->setVisible(visible);
-    getChildView("trash_btn_panel")->setVisible(visible);
+    getChildView("trash_btn_panel")->setVisible(false);
     // </FS:PP>
 
     if (visible)