diff --git a/indra/newview/skins/default/xui/en-us/menu_local_avs.xml b/indra/newview/skins/default/xui/en-us/menu_local_avs.xml
index 9913728d1..cf26de333 100644
--- a/indra/newview/skins/default/xui/en-us/menu_local_avs.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_local_avs.xml
@@ -47,19 +47,19 @@
     </menu_item_call>
     <menu_item_call label="Follow" name="Follow">
       <on_click function="List.Follow"/>
-      <on_visible function="List.IsNearby"/>
+      <on_visible function="List.EnableSingleSelected"/>
     </menu_item_call>
     <menu_item_call label="Move To" name="Move To">
       <on_click function="List.GoTo"/>
-      <on_enable function="List.EnableSingleSelected"/>
+      <on_visible function="List.EnableSingleSelected"/>
     </menu_item_call>
     <menu_item_call label="Offer Teleport" name="Offer Teleport">
       <on_click function="List.OfferTeleport"/>
-      <on_enable function="List.EnableAnySelected"/>
+      <on_visible function="List.EnableSingleSelected"/>
     </menu_item_call>
     <menu_item_call label="Teleport To" name="Teleport To">
       <on_click function="List.TeleportTo"/>
-      <on_enable function="List.EnableSingleSelected"/>
+      <on_visible function="List.EnableSingleSelected"/>
     </menu_item_call>
     <menu_item_call label="Request Teleport" name="Request Teleport">
       <on_click function="List.RequestTeleport"/>
@@ -71,20 +71,20 @@
     </menu_item_call>
     <menu_item_call label="Chat History" name="Chat History">
       <on_click function="List.ShowLog"/>
-      <on_enable function="List.EnableAnySelected"/>
+      <on_visible function="List.EnableAnySelected"/>
     </menu_item_call>
     <menu_item_call label="Track/Untrack" name="Track/Untrack">
-      <on_click function="List.Track"/>
-      <on_enable function="List.EnableSingleSelected"/>
+      <on_click function="Radar.Track"/>
+      <on_visible function="List.EnableAnySelected"/>
     </menu_item_call>
     <menu_item_separator/>
     <menu_item_call label="Copy Key" name="Copy Key">
       <on_click function="List.CopyUUIDs"/>
-      <on_enable function="List.EnableAnySelected"/>
+      <on_visible function="List.EnableAnySelected"/>
     </menu_item_call>
     <menu_item_call label="Copy Names" name="Copy Names">
       <on_click function="List.CopyNames"/>
-      <on_enable function="List.EnableAnySelected"/>
+      <on_visible function="List.EnableAnySelected"/>
     </menu_item_call>
     <menu_item_call label="Copy SLURL" name="Copy SLURL">
       <on_click function="List.CopySLURL"/>
diff --git a/indra/newview/skins/default/xui/en-us/menu_radar.xml b/indra/newview/skins/default/xui/en-us/menu_radar.xml
index 2c2fada1a..612b8a7d4 100644
--- a/indra/newview/skins/default/xui/en-us/menu_radar.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_radar.xml
@@ -47,20 +47,19 @@
     </menu_item_call>
     <menu_item_call label="Follow" name="Follow">
       <on_click function="List.Follow"/>
-      <on_visible function="List.IsNearby"/>
+      <on_visible function="List.EnableSingleSelected"/>
     </menu_item_call>
     <menu_item_call label="Move To" name="Move To">
       <on_click function="List.GoTo"/>
-      <on_enable function="List.EnableSingleSelected"/>
-      <on_visible function="List.IsNearby"/>
+      <on_visible function="List.EnableSingleSelected"/>
     </menu_item_call>
     <menu_item_call label="Offer Teleport" name="Offer Teleport">
       <on_click function="List.OfferTeleport"/>
-      <on_enable function="List.EnableAnySelected"/>
+      <on_visible function="List.EnableSingleSelected"/>
     </menu_item_call>
     <menu_item_call label="Teleport To" name="Teleport To" shortcut="control|Enter">
       <on_click function="List.TeleportTo"/>
-      <on_enable function="List.EnableSingleSelected"/>
+      <on_visible function="List.EnableSingleSelected"/>
     </menu_item_call>
     <menu_item_call label="Request Teleport" name="Request Teleport">
       <on_click function="List.RequestTeleport"/>
@@ -72,19 +71,20 @@
     </menu_item_call>
     <menu_item_call label="Chat History" name="Chat History">
       <on_click function="List.ShowLog"/>
-      <on_enable function="List.EnableAnySelected"/>
+      <on_visible function="List.EnableAnySelected"/>
     </menu_item_call>
     <menu_item_call label="Track/Untrack" name="Track/Untrack">
       <on_click function="Radar.Track"/>
-      <on_enable function="List.EnableSingleSelected"/>
+      <on_visible function="List.EnableAnySelected"/>
     </menu_item_call>
+    <menu_item_separator/>
     <menu_item_call label="Copy Key" name="Copy Key">
       <on_click function="List.CopyUUIDs"/>
-      <on_enable function="List.EnableAnySelected"/>
+      <on_visible function="List.EnableAnySelected"/>
     </menu_item_call>
-    <menu_item_call label="Copy Name" name="Copy Name">
+    <menu_item_call label="Copy Names" name="Copy Names">
       <on_click function="List.CopyNames"/>
-      <on_enable function="List.EnableAnySelected"/>
+      <on_visible function="List.EnableAnySelected"/>
     </menu_item_call>
     <menu_item_call label="Copy SLURL" name="Copy SLURL">
       <on_click function="List.CopySLURL"/>