diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 413dd812d..b4ddfc50f 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1937,6 +1937,10 @@ bool LLAppearanceMgr::canAddWearables(const uuid_vec_t& item_ids)
 		{
 			++n_clothes;
 		}
+		else if (item->getType() == LLAssetType::AT_BODYPART)
+		{
+			return false;	//If we have a bodypart in selection we cannot use 'add'.
+		}
 		else
 		{
 			LL_WARNS() << "Unexpected wearable type" << LL_ENDL;
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 252ca1eb7..0d94cc4ec 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -641,11 +641,6 @@ void disable_context_entries_if_present(LLMenuGL& menu,
 
         if (found)
         {
-			menu_item->setVisible(TRUE);
-			// A bit of a hack so we can remember that some UI element explicitly set this to be visible
-			// so that some other UI element from multi-select doesn't later set this invisible.
-			menu_item->pushVisible(TRUE);
-
 			menu_item->setEnabled(FALSE);
         }
     }