diff --git a/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx b/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx
index 3219f03a..eb22a6d8 100644
--- a/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx
+++ b/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx
@@ -90,7 +90,7 @@ const Einsatzdetails = ({
 		},
 	});
 	const dispatcherConnected = useDispatchConnectionStore((s) => s.status) === "connected";
-	const { setMissionFormValues, setOpen } = usePannelStore((state) => state);
+	const { setMissionFormValues, setOpen, setEditingMission } = usePannelStore((state) => state);
 	const [ignoreHpg, setIgnoreHpg] = useState(false);
 	return (
 		<div className="p-4 text-base-content">
@@ -214,7 +214,12 @@ const Einsatzdetails = ({
 							mission.hpgValidationState !== HpgValidationState.POSITION_AMANDED && (
 								<button
 									className="btn btn-sm btn-info btn-outline flex-3"
-									onClick={() => sendAlertMutation.mutate(mission.id)}
+									onClick={() => {
+										setOpen(false);
+										setMissionFormValues({});
+										setEditingMission(false, null);
+										sendAlertMutation.mutate(mission.id);
+									}}
 								>
 									<span className="flex items-center gap-2">
 										<BellRing size={16} /> Alarmieren
@@ -226,7 +231,12 @@ const Einsatzdetails = ({
 							mission.hpgValidationState !== HpgValidationState.POSITION_AMANDED && (
 								<button
 									className="btn btn-sm btn-info btn-outline flex-3"
-									onClick={() => sendAlertMutation.mutate(mission.id)}
+									onClick={() => {
+										setOpen(false);
+										setMissionFormValues({});
+										setEditingMission(false, null);
+										sendAlertMutation.mutate(mission.id);
+									}}
 									disabled
 								>
 									<span className="flex items-center gap-2">
@@ -268,6 +278,10 @@ const Einsatzdetails = ({
 											addressZip: parsed.addressZip,
 										},
 									});
+
+									setOpen(false);
+									setMissionFormValues({});
+									setEditingMission(false, null);
 									await sendAlertMutation.mutateAsync(mission.id);
 								}}
 							>