diff --git a/htdocs/lib/MapMarkers.js b/htdocs/lib/MapMarkers.js
index 973deef1..f3100803 100644
--- a/htdocs/lib/MapMarkers.js
+++ b/htdocs/lib/MapMarkers.js
@@ -278,7 +278,7 @@ FeatureMarker.prototype.getAnchorOffset = function() {
     return [0, -this.symHeight/2];
 };
 
-FeatureMarker.prototype.getInfoHTML = function(name) {
+FeatureMarker.prototype.getInfoHTML = function(name, receiverMarker = null) {
     var nameString    = this.url? Marker.linkify(name, this.url) : name;
     var commentString = this.comment? '<p align="center">' + this.comment + '</p>' : '';
     var detailsString = '';
@@ -325,6 +325,10 @@ FeatureMarker.prototype.getInfoHTML = function(name) {
         scheduleString = '<div>' + Marker.makeListTitle('Schedule') + scheduleString + '</div>';
     }
 
+    if (receiverMarker) {
+        distance = ' at ' + Marker.distanceKm(receiverMarker.position, this.position) + ' km';
+    }
+
     return '<h3>' + nameString + distance + '</h3>'
         + commentString + detailsString + scheduleString;
 };
@@ -453,7 +457,7 @@ AprsMarker.prototype.getAnchorOffset = function() {
     return [0, -12];
 };
 
-AprsMarker.prototype.getInfoHTML = function(name) {
+AprsMarker.prototype.getInfoHTML = function(name, receiverMarker = null) {
     var timeString = moment(this.lastseen).fromNow();
     var commentString = '';
     var weatherString = '';
@@ -568,6 +572,10 @@ AprsMarker.prototype.getInfoHTML = function(name) {
         detailsString = '<div>' + Marker.makeListTitle('Details') + detailsString + '</div>';
     }
 
+    if (receiverMarker) {
+        distance = ' at ' + Marker.distanceKm(receiverMarker.position, this.position) + ' km';
+    }
+
     if (this.hops && this.hops.length > 0) {
         var hops = this.hops.toString().split(',');
         hops.forEach(function(part, index, hops) {