diff --git a/client/src/components/Leaflet.js b/client/src/components/Leaflet.js
index 7dba7617a9..799cd37890 100644
--- a/client/src/components/Leaflet.js
+++ b/client/src/components/Leaflet.js
@@ -279,10 +279,13 @@ const BaseLeaflet = ({
           })
           .bindPopup(popupContent)
           .on("popupopen", e => {
-            // TODO LinkTo component will be utilized here to provide routing
             ReactDOM.render(
               <>
-                <b>{location.name}</b> @{" "}
+                <b>
+                  {/* // TODO: Find a way to work with LinkTo in different entry point here, not nested inside Router context */}
+                  <a href={`/locations/${location.uuid}`}>{location.name}</a>
+                </b>{" "}
+                @{" "}
                 <GeoLocation
                   coordinates={{
                     lat: location.lat,