diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1cd7d3a2f..22c90b7bf 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5868,6 +5868,17 @@ This should be as low as possible, but too low may break functionality</string>
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>DoubleClickTeleportMap</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable double-click-teleport for the map</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>DoubleClickTeleportMiniMap</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index fe05a02da..4c02d875e 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -2137,6 +2137,7 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask )
 			}
 		default:
 			{
+				if (!gSavedSettings.getBOOL("DoubleClickTeleportMap")) return true;
 				if (LLWorldMap::getInstance()->isTracking())
 				{
 					LLWorldMap::getInstance()->setTrackingDoubleClick();