diff --git a/Lora-Map/resources/js/marker.js b/Lora-Map/resources/js/marker.js
index 7dc7f44..55690ce 100644
--- a/Lora-Map/resources/js/marker.js
+++ b/Lora-Map/resources/js/marker.js
@@ -51,6 +51,18 @@ function parseAjaxPanic() {
     var panics = JSON.parse(this.responseText);
     for (var id in panics) {
       if (panics.hasOwnProperty(id)) {
+        var panicitem = panics[id];
+        if (markers.hasOwnProperty(id)) {
+          if (typeof markers[id].getPopup() === "undefined") {
+            markers[id].bindPopup("");
+          }
+          if (timeDiffRaw(panicitem["Triggerdtime"]) <= 10 && !markers[id].isPopupOpen()) {
+            markers[id].setPopupContent("ALERT!");
+            markers[id].openPopup();
+          } else if (timeDiffRaw(panicitem["Triggerdtime"]) > 10 && markers[id].isPopupOpen()) {
+            markers[id].closePopup();
+          }
+        }
       }
     }
   }
diff --git a/Lora-Map/resources/js/menu.js b/Lora-Map/resources/js/menu.js
index 662b226..d423dc9 100644
--- a/Lora-Map/resources/js/menu.js
+++ b/Lora-Map/resources/js/menu.js
@@ -118,4 +118,8 @@ function timeDiffToText(time) {
     return Math.floor(diff / (60 * 60)) + " h";
   }
   return Math.floor(diff / (60 * 60 * 24)) + " d";
+}
+
+function timeDiffRaw(time) {
+  return (Date.now() - Date.parse(time)) / 1000;
 }
\ No newline at end of file