diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json
index 4029b5b..5220417 100644
--- a/src-tauri/tauri.windows.conf.json
+++ b/src-tauri/tauri.windows.conf.json
@@ -5,6 +5,12 @@
                 "libcrypto-3-x64.dll",
                 "libssl-3-x64.dll"
             ]
-        }
+        },
+        "windows": [
+            {
+              "title": "JET Pilot",
+              "decorations": false
+            }
+        ]
     }
 }
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 72ec9f5..7b4109a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,7 +13,7 @@ import DialogHandler from "./components/DialogHandler.vue";
 </script>
 
 <template>
-  <AppLayout class="dark bg-zinc-900 text-sm rounded-lg">
+  <AppLayout class="dark bg-zinc-900 text-sm rounded-lg overflow-hidden">
     <Suspense>
       <SettingsContextProvider>
         <KubeContextProvider>
diff --git a/src/assets/icons/full_screen.svg b/src/assets/icons/full_screen.svg
new file mode 100644
index 0000000..2c106ab
--- /dev/null
+++ b/src/assets/icons/full_screen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M8 3V5H4V9H2V3H8ZM2 21V15H4V19H8V21H2ZM22 21H16V19H20V15H22V21ZM22 9H20V5H16V3H22V9Z"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/minimize.svg b/src/assets/icons/minimize.svg
new file mode 100644
index 0000000..3afdc9b
--- /dev/null
+++ b/src/assets/icons/minimize.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M21 11H21V13H3V11ZM21"></path></svg>
\ No newline at end of file
diff --git a/src/components/Navigation.vue b/src/components/Navigation.vue
index a42d8c8..9b3dff2 100644
--- a/src/components/Navigation.vue
+++ b/src/components/Navigation.vue
@@ -3,12 +3,20 @@ import ContextSwitcher from "./ContextSwitcher.vue";
 import NavigationGroup from "./NavigationGroup.vue";
 import NavigationItem from "./NavigationItem.vue";
 import { ScrollArea } from "@/components/ui/scroll-area";
+import { Button } from "@/components/ui/button";
 import { Kubernetes } from "@/services/Kubernetes";
 import { KubeContextStateKey } from "@/providers/KubeContextProvider";
 import { injectStrict } from "@/lib/utils";
 import { V1APIResource } from "@kubernetes/client-node";
 import pluralize from "pluralize";
+import { platform as getPlatform } from "@tauri-apps/api/os";
+import { getCurrent as getWindow } from "@tauri-apps/api/window"
+import { exit } from '@tauri-apps/api/process';
+import CloseIcon from "@/assets/icons/close.svg";
+import FullScreenIcon from "@/assets/icons/full_screen.svg";
+import MinimizeIcon from "@/assets/icons/minimize.svg";
 
+const targetPlatform = ref<string>("");
 const { context, namespace} = injectStrict(KubeContextStateKey);
 
 interface NavigationGroup {
@@ -158,8 +166,33 @@ const fetchResources = () => {
     });
 };
 
+const maxOrUnmaximize = () => {
+  const window = getWindow();
+ 
+  window.isMaximized().then((maximized) => {
+    if (maximized) {
+      window.unmaximize();
+    } else {
+      window.maximize();
+    }
+  });
+};
+
+const minimize = () => {
+  const window = getWindow();
+  window.minimize();
+};
+
+const quit = () => {
+  exit(0);
+};
+
 onMounted(() => {
   fetchResources();
+
+  getPlatform().then((platform) => {
+    targetPlatform.value = platform;
+  });
 });
 
 watch([context, namespace], () => {
@@ -169,9 +202,20 @@ watch([context, namespace], () => {
 
 <template>
   <div class="flex flex-col flex-shrink-0 relative min-w-[200px] max-w-[200px]">
-    <div class="absolute w-full h-[40px]" data-tauri-drag-region></div>
+    <div v-if="targetPlatform == 'win32'" class="p-2 pb-0 -mb-1 space-x-2" data-tauri-drag-region>
+      <Button size="xs" @click="quit">
+        <CloseIcon class="h-3 text-white" />
+      </Button>
+      <Button size="xs" @click="maxOrUnmaximize">
+        <FullScreenIcon class="h-3 text-white" />
+      </Button>
+      <Button size="xs" @click="minimize">
+        <MinimizeIcon class="h-3 text-white" />
+      </Button>
+    </div>
+    <div class="absolute w-full h-[40px]" v-else data-tauri-drag-region></div>
     <div class="flex flex-col flex-grow min-h-screen max-h-screen p-2 pr-0">
-      <ContextSwitcher class="mt-[30px]" />
+      <ContextSwitcher :class="{ 'mt-[30px]': targetPlatform !== 'win32'}" />
       <div class="flex w-full flex-grow flex-shrink overflow-hidden">
         <ScrollArea class="w-full mt-0 mb-0">
           <NavigationGroup
diff --git a/src/components/ui/scroll-area/ScrollArea.vue b/src/components/ui/scroll-area/ScrollArea.vue
index c56cf87..10f2fce 100644
--- a/src/components/ui/scroll-area/ScrollArea.vue
+++ b/src/components/ui/scroll-area/ScrollArea.vue
@@ -21,7 +21,7 @@ const props = withDefaults(
 
 <template>
   <ScrollAreaRoot :type="type" :class="cn('relative overflow-hidden', props.class)">
-    <ScrollAreaViewport class="h-full w-full  rounded-[inherit]">
+    <ScrollAreaViewport class="h-full w-full rounded-[inherit]">
       <slot />
     </ScrollAreaViewport>
     <ScrollBar />