diff --git a/apps/dispatch/app/(app)/dispatch/_components/StationSelect.tsx b/apps/dispatch/app/(app)/dispatch/_components/StationSelect.tsx
index 73dbab03..6d1e11a5 100644
--- a/apps/dispatch/app/(app)/dispatch/_components/StationSelect.tsx
+++ b/apps/dispatch/app/(app)/dispatch/_components/StationSelect.tsx
@@ -127,8 +127,10 @@ export function StationsSelect<T extends FieldValues>({
 			placeholder={
 				isMulti ? "Wähle ein oder mehrere Rettungsmittel aus" : "Wähle ein Rettungsmittel aus"
 			}
+			formatOptionLabel={(option: any) => option.component}
 			options={stationsOptions.map((s) => ({
-				label: (
+				label: s.label,
+				component: (
 					<div
 						className={cn(s.type === "vehicle" && isMulti && "tooltip tooltip-right")}
 						data-tip={
diff --git a/apps/dispatch/app/_components/Select.tsx b/apps/dispatch/app/_components/Select.tsx
index 81e38ff4..2db672ad 100644
--- a/apps/dispatch/app/_components/Select.tsx
+++ b/apps/dispatch/app/_components/Select.tsx
@@ -15,6 +15,7 @@ const customStyles: StylesConfig<any, false> = {
 		"&:hover": {
 			borderColor: "color-mix(in oklab, var(--color-base-content) 20%, #0000);",
 		},
+		color: "var(--color-primary-content)",
 	}),
 	option: (provided, state) => ({
 		...provided,
@@ -34,12 +35,24 @@ const customStyles: StylesConfig<any, false> = {
 		...provided,
 		backgroundColor: "var(--color-base-300)",
 	}),
+	input: (provided) => ({
+		...provided,
+		color: "var(--color-primary-content)",
+	}),
 	menu: (provided) => ({
 		...provided,
 		backgroundColor: "var(--color-base-100)",
 		borderRadius: "0.5rem",
 		zIndex: 9999,
 	}),
+	menuPortal: (provided) => ({
+		...provided,
+		maxHeight: "230px",
+	}),
+	menuList: (provided) => ({
+		...provided,
+		maxHeight: "230px",
+	}),
 };
 
 interface SelectProps extends Omit<SelectTemplateProps, "form" | "value" | "onChange"> {
diff --git a/apps/dispatch/app/_components/map/_components/AircraftMarkerTabs.tsx b/apps/dispatch/app/_components/map/_components/AircraftMarkerTabs.tsx
index 8939a3c7..1206f900 100644
--- a/apps/dispatch/app/_components/map/_components/AircraftMarkerTabs.tsx
+++ b/apps/dispatch/app/_components/map/_components/AircraftMarkerTabs.tsx
@@ -385,6 +385,31 @@ const SDSTab = ({
 		return () => clearInterval(interval);
 	});
 
+	const sendSds = () => {
+		sendSdsMutation
+			.mutateAsync({
+				missionId: mission?.id,
+				sdsMessage: {
+					type: "sds-log",
+					auto: false,
+					timeStamp: new Date().toISOString(),
+					data: {
+						stationId: aircraft.Station.id,
+						station: aircraft.Station,
+						message: note,
+						user: getPublicUser(session.data!.user, {
+							ignorePrivacy: true,
+						}),
+					},
+				},
+			})
+			.then(() => {
+				toast.success("SDS-Nachricht gesendet");
+				setIsChatOpen(false);
+				setNote("");
+			});
+	};
+
 	return (
 		<div className="p-4">
 			{dispatcherConnected && (
@@ -409,32 +434,16 @@ const SDSTab = ({
 									value={note}
 									onChange={(e) => setNote(e.target.value)}
 									ref={textInputRef}
+									onKeyDown={(e) => {
+										if (e.key === "Enter" && note.trim()) {
+											sendSds();
+										}
+									}}
 								/>
 								<button
 									className="btn btn-sm btn-primary btn-outline"
 									onClick={() => {
-										sendSdsMutation
-											.mutateAsync({
-												missionId: mission?.id,
-												sdsMessage: {
-													type: "sds-log",
-													auto: false,
-													timeStamp: new Date().toISOString(),
-													data: {
-														stationId: aircraft.Station.id,
-														station: aircraft.Station,
-														message: note,
-														user: getPublicUser(session.data!.user, {
-															ignorePrivacy: true,
-														}),
-													},
-												},
-											})
-											.then(() => {
-												toast.success("SDS-Nachricht gesendet");
-												setIsChatOpen(false);
-												setNote("");
-											});
+										sendSds();
 									}}
 								>
 									<Plus size={20} />
diff --git a/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx b/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx
index eaf74628..00d3de06 100644
--- a/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx
+++ b/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx
@@ -588,7 +588,34 @@ const FMSStatusHistory = ({ mission }: { mission: Mission }) => {
 		return () => clearInterval(interval);
 	});
 
-	if (!session.data?.user) return null;
+	const addMessage = () => {
+		if (!session.data?.user) return null;
+		const newMissionLog = [
+			...mission.missionLog,
+			{
+				type: "message-log",
+				auto: false,
+				timeStamp: new Date().toISOString(),
+				data: {
+					message: note,
+					user: getPublicUser(session.data?.user, { ignorePrivacy: true }),
+				},
+			} as MissionMessageLog,
+		];
+		editMissionMutation
+			.mutateAsync({
+				id: mission.id,
+				mission: {
+					// eslint-disable-next-line @typescript-eslint/no-explicit-any
+					missionLog: newMissionLog as any,
+				},
+			})
+			.then(() => {
+				setIsAddingNote(false);
+				setNote("");
+			});
+	};
+
 	return (
 		<div className="p-4">
 			{dispatcherConnected && (
@@ -612,36 +639,13 @@ const FMSStatusHistory = ({ mission }: { mission: Mission }) => {
 									value={note}
 									onChange={(e) => setNote(e.target.value)}
 									ref={textInputRef}
-								/>
-								<button
-									className="btn btn-sm btn-primary btn-outline"
-									onClick={() => {
-										const newMissionLog = [
-											...mission.missionLog,
-											{
-												type: "message-log",
-												auto: false,
-												timeStamp: new Date().toISOString(),
-												data: {
-													message: note,
-													user: getPublicUser(session.data?.user, { ignorePrivacy: true }),
-												},
-											} as MissionMessageLog,
-										];
-										editMissionMutation
-											.mutateAsync({
-												id: mission.id,
-												mission: {
-													// eslint-disable-next-line @typescript-eslint/no-explicit-any
-													missionLog: newMissionLog as any,
-												},
-											})
-											.then(() => {
-												setIsAddingNote(false);
-												setNote("");
-											});
+									onKeyDown={(e) => {
+										if (e.key === "Enter" && note.trim()) {
+											addMessage();
+										}
 									}}
-								>
+								/>
+								<button className="btn btn-sm btn-primary btn-outline" onClick={() => addMessage()}>
 									<Plus size={20} />
 								</button>
 								<button
diff --git a/packages/database/prisma/schema/keyword.prisma b/packages/database/prisma/schema/keyword.prisma
index 4c1c8960..b746c95b 100644
--- a/packages/database/prisma/schema/keyword.prisma
+++ b/packages/database/prisma/schema/keyword.prisma
@@ -6,7 +6,7 @@ enum KEYWORD_CATEGORY {
     K_KIND
     M_BERGRETTUNG
     P_PSYCHIATRISCH
-    V_VERLETZUNG
+    V_VERLEGUNG
     W_WASSERRETTUNG
     Z_SONSTIGES
 }
diff --git a/packages/database/prisma/schema/migrations/20250705025706_rename_v_verletzung/migration.sql b/packages/database/prisma/schema/migrations/20250705025706_rename_v_verletzung/migration.sql
new file mode 100644
index 00000000..4fefd427
--- /dev/null
+++ b/packages/database/prisma/schema/migrations/20250705025706_rename_v_verletzung/migration.sql
@@ -0,0 +1,17 @@
+/*
+  Warnings:
+
+  - The values [V_VERLETZUNG] on the enum `KEYWORD_CATEGORY` will be removed. If these variants are still used in the database, this will fail.
+
+*/
+
+DELETE FROM "Keyword" WHERE "category" = 'V_VERLETZUNG';
+
+-- AlterEnum
+BEGIN;
+CREATE TYPE "KEYWORD_CATEGORY_new" AS ENUM ('AB_ATMUNG', 'C_KREISLAUF', 'D_NEUROLOGISCH', 'E_TRAUMA_SONSTIGES', 'K_KIND', 'M_BERGRETTUNG', 'P_PSYCHIATRISCH', 'V_VERLEGUNG', 'W_WASSERRETTUNG', 'Z_SONSTIGES');
+ALTER TABLE "Keyword" ALTER COLUMN "category" TYPE "KEYWORD_CATEGORY_new" USING ("category"::text::"KEYWORD_CATEGORY_new");
+ALTER TYPE "KEYWORD_CATEGORY" RENAME TO "KEYWORD_CATEGORY_old";
+ALTER TYPE "KEYWORD_CATEGORY_new" RENAME TO "KEYWORD_CATEGORY";
+DROP TYPE "KEYWORD_CATEGORY_old";
+COMMIT;