diff --git a/static/app.js b/static/app.js
index 0b93778..29e3137 100644
--- a/static/app.js
+++ b/static/app.js
@@ -224,7 +224,7 @@
     function buildPopup(r) {
         var bandClass = r.band === "2m" ? "band-2m" : "band-70cm";
         var html = '<div class="rptr-popup">';
-        html += "<h3>" + escapeHtml(r.callsign) + "</h3>";
+        html += '<h3><a href="https://brandmeister.network/?page=repeater&id=' + r.id + '" target="_blank" rel="noopener">' + escapeHtml(r.callsign) + "</a></h3>";
         html += "<table>";
         html +=
             "<tr><td>Freq</td><td>" +
@@ -506,10 +506,11 @@
             item.className = "pin-list-item";
             var bandColor = r.band === "2m" ? "#1976D2" : "#D32F2F";
             item.innerHTML =
-                '<span class="callsign">' + escapeHtml(r.callsign) + "</span>" +
+                '<a class="callsign" href="https://brandmeister.network/?page=repeater&id=' + r.id + '" target="_blank" rel="noopener">' + escapeHtml(r.callsign) + "</a>" +
                 '<span class="freq" style="color:' + bandColor + '">' + r.frequency.toFixed(4) + "</span>" +
                 '<span class="dist">' + r.distance + " km</span>";
-            item.addEventListener("click", function () {
+            item.addEventListener("click", function (e) {
+                if (e.target.closest("a")) return;
                 map.setView([r.lat, r.lng], 14);
                 markerLayer.eachLayer(function (layer) {
                     if (layer.getLatLng &&
diff --git a/static/style.css b/static/style.css
index c449964..c0cab93 100644
--- a/static/style.css
+++ b/static/style.css
@@ -403,6 +403,11 @@ html, body {
     font-weight: 600;
     color: var(--text);
     min-width: 70px;
+    text-decoration: none;
+}
+
+.pin-list-item .callsign:hover {
+    text-decoration: underline;
 }
 
 .pin-list-item .freq {
@@ -435,7 +440,15 @@ html, body {
 .rptr-popup h3 {
     margin: 0 0 6px 0;
     font-size: 15px;
+}
+
+.rptr-popup h3 a {
     color: var(--popup-heading);
+    text-decoration: none;
+}
+
+.rptr-popup h3 a:hover {
+    text-decoration: underline;
 }
 
 .rptr-popup table {