diff --git a/apps/dispatch/app/_components/navbar/ModeSwitchDropdown.tsx b/apps/dispatch/app/_components/navbar/ModeSwitchDropdown.tsx
new file mode 100644
index 00000000..a79fbb70
--- /dev/null
+++ b/apps/dispatch/app/_components/navbar/ModeSwitchDropdown.tsx
@@ -0,0 +1,30 @@
+"use client";
+
+import { ArrowLeftRight, Plane, Workflow } from "lucide-react";
+import Link from "next/link";
+import { usePathname } from "next/navigation";
+
+export default function ModeSwitchDropdown() {
+	const path = usePathname();
+
+	return (
+		<details className="dropdown z-[9999]">
+			<summary className="btn m-1">
+				<ArrowLeftRight /> {path.includes("pilot") && "Pilot"}
+				{path.includes("dispatch") && "Leitstelle"}
+			</summary>
+			<ul className="menu dropdown-content bg-base-100 rounded-box z-1 w-52 p-2 shadow-sm">
+				<li>
+					<Link href={"/dispatch"}>
+						<Workflow /> Leitstelle
+					</Link>
+				</li>
+				<li>
+					<Link href={"/pilot"}>
+						<Plane /> Pilot
+					</Link>
+				</li>
+			</ul>
+		</details>
+	);
+}
diff --git a/apps/dispatch/app/_components/Settings.tsx b/apps/dispatch/app/_components/navbar/Settings.tsx
similarity index 100%
rename from apps/dispatch/app/_components/Settings.tsx
rename to apps/dispatch/app/_components/navbar/Settings.tsx
diff --git a/apps/dispatch/app/dispatch/_components/navbar/Navbar.tsx b/apps/dispatch/app/dispatch/_components/navbar/Navbar.tsx
index a0ab4768..f919d210 100644
--- a/apps/dispatch/app/dispatch/_components/navbar/Navbar.tsx
+++ b/apps/dispatch/app/dispatch/_components/navbar/Navbar.tsx
@@ -6,7 +6,8 @@ import { Audio } from "../../../_components/Audio";
 /* import { useState } from "react"; */
 import { ExitIcon, ExternalLinkIcon } from "@radix-ui/react-icons";
 import Link from "next/link";
-import { Settings } from "_components/Settings";
+import { Settings } from "_components/navbar/Settings";
+import ModeSwitchDropdown from "_components/navbar/ModeSwitchDropdown";
 
 export default function Navbar() {
 	/* const [isDark, setIsDark] = useState(false);
@@ -22,10 +23,7 @@ export default function Navbar() {
 
 	return (
 		<div className="navbar bg-base-100 shadow-sm flex gap-5 justify-between">
-			<div className="flex items-center gap-2">
-				<a className="btn btn-ghost text-xl">VAR Leitstelle V2</a>
-			</div>
-
+			<ModeSwitchDropdown />
 			<div className="flex items-center gap-5">
 				<div className="flex items-center gap-2">
 					<Audio />
diff --git a/apps/dispatch/app/globals.css b/apps/dispatch/app/globals.css
index db863e7a..c64d71cc 100644
--- a/apps/dispatch/app/globals.css
+++ b/apps/dispatch/app/globals.css
@@ -23,6 +23,10 @@
 	--color-fms-9: rgb(10, 134, 25);
 }
 
+:root:has(:is(.modal-open, .modal:target, .modal-toggle:checked + .modal, .modal[open])) {
+	scrollbar-gutter: unset;
+}
+
 .leaflet-popup-tip-container {
 	display: none;
 }
diff --git a/apps/dispatch/app/pilot/_components/navbar/Navbar.tsx b/apps/dispatch/app/pilot/_components/navbar/Navbar.tsx
index f4bd4ac1..c6e08d5c 100644
--- a/apps/dispatch/app/pilot/_components/navbar/Navbar.tsx
+++ b/apps/dispatch/app/pilot/_components/navbar/Navbar.tsx
@@ -6,7 +6,8 @@ import { Audio } from "../../../_components/Audio";
 /* import { useState } from "react"; */
 import { ExitIcon, ExternalLinkIcon } from "@radix-ui/react-icons";
 import Link from "next/link";
-import { Settings } from "_components/Settings";
+import { Settings } from "_components/navbar/Settings";
+import ModeSwitchDropdown from "_components/navbar/ModeSwitchDropdown";
 
 export default function Navbar() {
 	/* const [isDark, setIsDark] = useState(false);
@@ -22,10 +23,7 @@ export default function Navbar() {
 
 	return (
 		<div className="navbar bg-base-100 shadow-sm flex gap-5 justify-between">
-			<div className="flex items-center gap-2">
-				<a className="btn btn-ghost text-xl">VAR Leitstelle V2</a>
-			</div>
-
+			<ModeSwitchDropdown />
 			<div className="flex items-center gap-5">
 				<div className="flex items-center gap-2">
 					<Audio />