diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 454be9d6eeec43e1672cded4bbd14dc2b5d8c4c0..afcdcb065952ddf73998535db52ba153153148f3 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1964,12 +1964,16 @@ BOOL LLToolPie::handleRightClickPick()
 // [/RLVa:KB]
 				if (is_other_attachment)
 				{
-					gMenuAttachmentOther->getChild<LLUICtrl>("Avatar Mute")->setValue(mute_msg);
+					if(auto av_manage = gMenuHolder->findChild<LLUICtrl>("Avatar Attachment Manage"))
+						if(auto av_mute = av_manage->findChild<LLUICtrl>("Avatar Mute"))
+							av_mute->setValue(mute_msg);
 					gMenuAttachmentOther->show(x, y);
 				}
 				else
 				{
-					gMenuAvatarOther->getChild<LLUICtrl>("Avatar Mute")->setValue(mute_msg);
+					if (auto av_manage = gMenuHolder->findChild<LLUICtrl>("Avatar Manage"))
+						if (auto av_mute = av_manage->findChild<LLUICtrl>("Avatar Mute"))
+							av_mute->setValue(mute_msg);
 					gMenuAvatarOther->show(x, y);
 				}
 // [RLVa:KB] - Checked: 2010-04-11 (RLVa-1.2.0e) | Modified: RLVa-1.1.0l
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index 035e591f75761ebf1f35991982e02ef7b6a28410..6011f611ae402acb46e0af142ece9394d4edf291 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -2,7 +2,7 @@
 <!-- *NOTE: See also menu_avatar_other.xml -->
 <context_menu
  layout="topleft"
- name="Avatar Pie">
+ name="Avatar Attachment Pie">
   <menu_item_call
    label="View Profile"
    name="Profile...">
@@ -174,7 +174,7 @@
   </context_menu>
   <context_menu
    label="Manage"
-   name="Manage">
+   name="Avatar Attachment Manage">
     <menu_item_call
      enabled="false"
      label="Block"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index 85343decce61978ef58e1dad1f87417bb1d4492b..2c7a25f0c3d8e84e86ad36e617982e4c09d184f8 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -176,7 +176,7 @@
   </context_menu>
   <context_menu
    label="Manage"
-   name="Manage">
+   name="Avatar Manage">
     <menu_item_call
      enabled="false"
      label="Block"