diff --git a/htdocs/lib/MessagePanel.js b/htdocs/lib/MessagePanel.js
index 61c1c2d8..cf581c08 100644
--- a/htdocs/lib/MessagePanel.js
+++ b/htdocs/lib/MessagePanel.js
@@ -330,7 +330,7 @@ AdsbMessagePanel.prototype.pushMessage = function(message) {
     }
 
     state.el.html(
-        '<td>' + state.icao + '</td>' +
+        '<td><a href="map?icao=' + state.icao + '" target="openwebrx-map">' + state.icao + '</a></td>' +
         '<td>' + ifDefined(state.identification) + '</td>' +
         '<td>' + ifDefined(state.altitude) + '</td>' +
         '<td>' + ifDefined(state.groundspeed || state.IAS || state.TAS, Math.round) + '</td>' +
diff --git a/htdocs/map.js b/htdocs/map.js
index 953438ed..7d267086 100644
--- a/htdocs/map.js
+++ b/htdocs/map.js
@@ -7,6 +7,8 @@ $(function(){
     }
     var expectedLocator;
     if (query.has('locator')) expectedLocator = query.get('locator');
+    var expectedIcao;
+    if (query.has('icao')) expectedIcao = query.get('icao');
 
     var protocol = window.location.protocol.match(/https/) ? 'wss' : 'ws';
 
@@ -164,6 +166,12 @@ $(function(){
                         expectedCallsign = false;
                     }
 
+                    if (expectedIcao && expectedIcao === update.source.icao) {
+                        map.panTo(pos);
+                        showMarkerInfoWindow(update.source, pos);
+                        expectedIcao = false;
+                    }
+
                     if (infowindow && infowindow.source && shallowEquals(infowindow.source, update.source)) {
                         showMarkerInfoWindow(infowindow.source, pos);
                     }