diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 29542c4ecbbcf49dad39e4d3aa5ef98e6ee0e391..a7774871d9311cf78bd9b8be67ae94cefee0469d 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -223,7 +223,7 @@ void LLNetMap::draw()
 	static LLCachedControl<bool> enable_object_render(gSavedSettings, "AlchemyMinimapRenderObjects", true);
 	static LLCachedControl<bool> render_guide_line(gSavedSettings, "AlchemyMinimapGuideLine", false);
     static LLCachedControl<bool> map_chat_ring(gSavedSettings, "AlchemyMinimapChatRings", false);
-    static LLCachedControl<bool> minimap_parcel_boundries(gSavedSettings, "AlchemyMinimapParcelBoundries", false);
+    static LLCachedControl<bool> minimap_parcel_boundries(gSavedSettings, "MiniMapShowPropertyLines", false);
 	
 	if (mObjectImagep.isNull())
 	{
@@ -1277,6 +1277,8 @@ void LLNetMap::createParcelImage()
 
 BOOL LLNetMap::handleMouseDown(S32 x, S32 y, MASK mask)
 {
+	if (!(mask & MASK_SHIFT)) return FALSE;
+
     // Start panning
     gFocusMgr.setMouseCapture(this);
 
@@ -1427,17 +1429,18 @@ BOOL LLNetMap::handleHover( S32 x, S32 y, MASK mask )
 			gViewerWindow->moveCursorToCenter();
 		}
 	}
-
-    if (mask & MASK_SHIFT)
-    {
-        // If shift is held, change the cursor to hint that the map can be
-        // dragged. However, holding shift is not required to drag the map.
-        gViewerWindow->setCursor( UI_CURSOR_TOOLPAN );
-    }
-    else
-    {
-        gViewerWindow->setCursor( UI_CURSOR_CROSS );
-    }
+	else
+	{
+		if (mask & MASK_SHIFT)
+		{
+			// If shift is held, change the cursor to hint that the map can be dragged
+			gViewerWindow->setCursor( UI_CURSOR_TOOLPAN );
+		}
+		else
+		{
+			gViewerWindow->setCursor( UI_CURSOR_CROSS );
+		}
+	}
 
 	return TRUE;
 }
diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml
index cc57fcd755394e61cdc7093c318f8959b6a71d08..8caff8f775f290158b7e5ca9358846388b40e15d 100644
--- a/indra/newview/skins/default/xui/en/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml
@@ -70,16 +70,6 @@
              parameter="camera_at_top" />
     </menu_item_check>
 	<menu_item_separator />
-    <menu_item_check
-     label="Show parcel boundaries"
-     name="Show parcel boundaries">
-        <menu_item_check.on_check
-         control="MiniMapShowPropertyLines" />
-        <menu_item_check.on_click
-         function="ToggleControl"
-         parameter="MiniMapShowPropertyLines" />
-    </menu_item_check>
-    <menu_item_separator />
     <menu_item_check
      label="Auto-center map"
      name="Auto-center map">
@@ -131,13 +121,13 @@
     label="Parcel Boundries"
     name="Parcel Boundries">
     <menu_item_check.on_check
-      control="AlchemyMinimapParcelBoundries" />
+      control="MiniMapShowPropertyLines" />
     <menu_item_check.on_click
       function="ToggleControl"
-      parameter="AlchemyMinimapParcelBoundries" />
+      parameter="MiniMapShowPropertyLines" />
   </menu_item_check>
     <menu_item_check
-    enabled_control="AlchemyMinimapParcelBoundries"
+    enabled_control="MiniMapShowPropertyLines"
     label="Parcels For Sale"
     name="Parcels For Sale">
     <menu_item_check.on_check
@@ -147,7 +137,7 @@
       parameter="AlchemyMiniMapForSaleParcels" />
   </menu_item_check>
     <menu_item_check
-    enabled_control="AlchemyMinimapParcelBoundries"
+    enabled_control="MiniMapShowPropertyLines"
     label="Parcel Access"
     name="Parcel Access">
     <menu_item_check.on_check