diff --git a/gym_data.php b/gym_data.php
index 781b34076..77ce3bb0d 100644
--- a/gym_data.php
+++ b/gym_data.php
@@ -274,4 +274,4 @@
 
 $p['token'] = refreshCsrfToken();
 
-echo json_encode($p);
\ No newline at end of file
+echo json_encode($p);
diff --git a/raw_data.php b/raw_data.php
index 47ce368fa..7cb467a8e 100644
--- a/raw_data.php
+++ b/raw_data.php
@@ -1546,4 +1546,4 @@ function get_recent($swLat, $swLng, $neLat, $neLng, $tstamp = 0, $oSwLat = 0, $o
     }
 
     return $recent;
-}
\ No newline at end of file
+}
diff --git a/static/js/map.js b/static/js/map.js
index 9f3ed9ef9..6f32a38a6 100644
--- a/static/js/map.js
+++ b/static/js/map.js
@@ -465,7 +465,7 @@ function pokemonLabel(item) {
         ' <span class="label-countdown" disappears-at="' + disappearTime + '">(00m00s)</span>' +
         '</div>' +
         '<div>' +
-        'Location: <a href="javascript:void(0)" onclick="javascript:openMapDirections(' + latitude + ', ' + longitude + ')" title="View in Maps">' + latitude.toFixed(6) + ', ' + longitude.toFixed(7) + '</a>' +
+        'Location: <a href="javascript:void(0)" onclick="javascript:openMapDirections(' + latitude + ', ' + longitude + ')" title="View in Maps">' + latitude.toFixed(6) + ', ' + longitude.toFixed(7) + '</a> - <a href="./?lat=' + latitude + '&lon=' + longitude + '&zoom=16">Share link</a>' +
         '</div>' +
         details +
         '<div>' +
@@ -2437,14 +2437,18 @@ $(function () {
             centerMapOnLocation()
         }
 
-        if (Store.get('startAtLastLocation')) {
-            var position = Store.get('startAtLastLocationPosition')
-            var lat = 'lat' in position ? position.lat : centerLat
-            var lng = 'lng' in position ? position.lng : centerLng
-
-            var latlng = new google.maps.LatLng(lat, lng)
-            locationMarker.setPosition(latlng)
-            map.setCenter(latlng)
+        var currentLocation = window.location.href
+        if (currentLocation.includes('lat') && currentLocation.includes('lon')) {
+            // Getting position from URL
+        } else {
+            if (Store.get('startAtLastLocation')) {
+                var position = Store.get('startAtLastLocationPosition')
+                var lat = 'lat' in position ? position.lat : centerLat
+                var lng = 'lng' in position ? position.lng : centerLng
+                var latlng = new google.maps.LatLng(lat, lng)
+                locationMarker.setPosition(latlng)
+                map.setCenter(latlng)
+            }
         }
 
         $selectLocationIconMarker.select2({