diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 62f82ea274..73e7c0fb29 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -455,6 +455,13 @@ bool LLFloaterWorldMap::postBuild()
     mTeleportCoordSpinZ = getChild<LLSpinCtrl>("teleport_coordinate_z");
     // </FS>
 
+    // <FS:TJ> OpenSim max value for Z height can go well beyond 10k, U16_MAX should suffice
+    if (!LLGridManager::getInstance()->isInSecondLife())
+    {
+        mTeleportCoordSpinZ->setMaxValue(U16_MAX);
+    }
+    // </FS:TJ>
+
     mFriendCombo = getChild<LLComboBox>("friend combo");
     mFriendCombo->selectFirstItem();
     mFriendCombo->setPrearrangeCallback(boost::bind(&LLFloaterWorldMap::onAvatarComboPrearrange, this));
@@ -1153,7 +1160,7 @@ void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S3
     {
         LLViewerRegion* regionp = gAgent.getRegion();
         F32 min_sim_height = regionp ? regionp->getMinSimHeight() : 0.f;
-        z_coord = llclamp(z_coord, min_sim_height, 4096);
+        z_coord = llclamp(z_coord, min_sim_height, U16_MAX);
     }
     else
     {
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 4a0bf0e8de..0e924f9740 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -644,7 +644,7 @@
       left="0"
       name="events_label"
       top_pad="16"
-      width="70">
+      width="65">
       Location:
       </text>
       <spinner
@@ -658,7 +658,7 @@
         max_val="8191"
         min_val="0"
         name="teleport_coordinate_x"
-        width="44" >
+        width="52" >
         <spinner.commit_callback 
           function="WMap.Coordinates"/>
       </spinner>
@@ -673,7 +673,7 @@
         max_val="8191"
         min_val="0"
         name="teleport_coordinate_y"
-		width="44">
+		width="52">
         <spinner.commit_callback
           function="WMap.Coordinates"/>
       </spinner>