diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp
index 1147b48645..be4c7c1bb5 100644
--- a/indra/newview/rlvui.cpp
+++ b/indra/newview/rlvui.cpp
@@ -360,11 +360,11 @@ void RlvUIEnabler::onToggleShowMinimap()
 
 	// Break/reestablish the visibility connection for the nearby people panel embedded minimap instance
 	LLPanel* pPeoplePanel = LLSideTray::getInstance()->getPanel("panel_people");
-	LLPanel* pNetMapPanel = (pPeoplePanel) ? pPeoplePanel->getChild<LLPanel>("Net Map Panel", 1) : NULL;
+	LLPanel* pNetMapPanel = (pPeoplePanel) ? pPeoplePanel->getChild<LLPanel>("minimaplayout", TRUE) : NULL;
 	RLV_ASSERT( (pPeoplePanel) && (pNetMapPanel) );
 	if (pNetMapPanel)
 	{
-		pNetMapPanel->setMakeVisibleControlVariable( (fEnable) ? gSavedSettings.getControl("NearbyListShowMap").get() : NULL);
+		pNetMapPanel->setMakeVisibleControlVariable( (fEnable) ? gSavedSettings.getControl("ShowRadarMinimap").get() : NULL);
 		// Reestablishing the visiblity connection will show the panel if needed so we only need to take care of hiding it when needed
 		if ( (!fEnable) && (pNetMapPanel->getVisible()) )
 			pNetMapPanel->setVisible(false);
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
index c99d2d23fe..955476848b 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
@@ -7,11 +7,14 @@
   <menu_item_check
      label="Show Minimap above Radar"
      name="ShowRadarMinimap">
-	 <menu_item_check.on_check
-     	control="ShowRadarMinimap" />
+     <menu_item_check.on_check
+        control="ShowRadarMinimap" />
      <menu_item_check.on_click
         function="ToggleControl"
         parameter="ShowRadarMinimap" />
+     <menu_item_check.on_enable
+        function="RLV.EnableIfNot"
+        parameter="showminimap" />
   </menu_item_check>
   
   <menu_item_check