diff --git a/tasks/enduro-trails/prototype/static/app.js b/tasks/enduro-trails/prototype/static/app.js
index d369a18..d083d7b 100644
--- a/tasks/enduro-trails/prototype/static/app.js
+++ b/tasks/enduro-trails/prototype/static/app.js
@@ -1281,7 +1281,12 @@ function renderMarkers() {
 }
 
 function removeMarker(id) {
-  if (namedMarkerObjects[id]) { namedMarkerObjects[id].remove(); delete namedMarkerObjects[id]; }
+  if (namedMarkerObjects[id]) {
+    const popup = namedMarkerObjects[id].getPopup();
+    if (popup) popup.remove();
+    namedMarkerObjects[id].remove();
+    delete namedMarkerObjects[id];
+  }
   const markers = loadMarkers().filter(m => m.id !== id);
   saveMarkers(markers);
 }