diff --git a/apps/desktop/src/components/main/body/index.tsx b/apps/desktop/src/components/main/body/index.tsx
index cb44c2c1e4..303aec4faa 100644
--- a/apps/desktop/src/components/main/body/index.tsx
+++ b/apps/desktop/src/components/main/body/index.tsx
@@ -13,12 +13,14 @@ import { Button } from "@hypr/ui/components/ui/button";
 import { cn } from "@hypr/utils";
 
 import { useShell } from "../../../contexts/shell";
+import { useIsLinux } from "../../../hooks/usePlatform";
 import {
   type Tab,
   uniqueIdfromTab,
   useTabs,
 } from "../../../store/zustand/tabs";
 import { ChatFloatingButton } from "../../chat";
+import { TrafficLights } from "../../window/traffic-lights";
 import { useNewNote } from "../shared";
 import { TabContentContact, TabItemContact } from "./contacts";
 import { TabContentEmpty, TabItemEmpty } from "./empty";
@@ -58,6 +60,7 @@ export function Body() {
 
 function Header({ tabs }: { tabs: Tab[] }) {
   const { leftsidebar } = useShell();
+  const isLinux = useIsLinux();
   const {
     select,
     close,
@@ -93,8 +96,10 @@ function Header({ tabs }: { tabs: Tab[] }) {
       className={cn([
         "w-full h-9 flex items-center",
         !leftsidebar.expanded && "pl-[72px]",
+        isLinux && "pl-3",
       ])}
     >
+      {isLinux && <TrafficLights className="mr-2" />}
       {!leftsidebar.expanded && (
         <Button
           size="icon"
diff --git a/apps/desktop/src/components/window/traffic-lights.tsx b/apps/desktop/src/components/window/traffic-lights.tsx
new file mode 100644
index 0000000000..35dd70434c
--- /dev/null
+++ b/apps/desktop/src/components/window/traffic-lights.tsx
@@ -0,0 +1,34 @@
+import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+
+import { cn } from "@hypr/utils";
+
+export function TrafficLights({ className }: { className?: string }) {
+  const win = getCurrentWebviewWindow();
+
+  const onClose = () => win.close();
+  const onMinimize = () => win.minimize();
+  const onMaximize = () => win.toggleMaximize();
+
+  return (
+    <div className={cn(["flex gap-2 items-center", className])}>
+      <button
+        type="button"
+        data-tauri-drag-region="false"
+        onClick={onClose}
+        className="h-3 w-3 rounded-full bg-[#ff5f57] border border-black/10 hover:brightness-90 transition-all"
+      />
+      <button
+        type="button"
+        data-tauri-drag-region="false"
+        onClick={onMinimize}
+        className="h-3 w-3 rounded-full bg-[#ffbd2e] border border-black/10 hover:brightness-90 transition-all"
+      />
+      <button
+        type="button"
+        data-tauri-drag-region="false"
+        onClick={onMaximize}
+        className="h-3 w-3 rounded-full bg-[#28c840] border border-black/10 hover:brightness-90 transition-all"
+      />
+    </div>
+  );
+}
diff --git a/apps/desktop/src/hooks/usePlatform.ts b/apps/desktop/src/hooks/usePlatform.ts
new file mode 100644
index 0000000000..640ffd9369
--- /dev/null
+++ b/apps/desktop/src/hooks/usePlatform.ts
@@ -0,0 +1,19 @@
+import { platform, type Platform } from "@tauri-apps/plugin-os";
+
+export type { Platform };
+
+export function usePlatform(): Platform {
+  return platform();
+}
+
+export function useIsLinux(): boolean {
+  return usePlatform() === "linux";
+}
+
+export function useIsMacos(): boolean {
+  return usePlatform() === "macos";
+}
+
+export function useIsWindows(): boolean {
+  return usePlatform() === "windows";
+}
diff --git a/apps/desktop/src/routes/app/settings/_layout.tsx b/apps/desktop/src/routes/app/settings/_layout.tsx
index 7588d6259a..47bc193298 100644
--- a/apps/desktop/src/routes/app/settings/_layout.tsx
+++ b/apps/desktop/src/routes/app/settings/_layout.tsx
@@ -23,6 +23,8 @@ import { Button } from "@hypr/ui/components/ui/button";
 import { cn } from "@hypr/utils";
 
 import { useTemplateNavigation } from "../../../components/settings/template/utils";
+import { TrafficLights } from "../../../components/window/traffic-lights";
+import { useIsLinux } from "../../../hooks/usePlatform";
 import * as main from "../../../store/tinybase/main";
 
 const TAB_KEYS = [
@@ -166,6 +168,7 @@ function Group({
   includeTrafficLight?: boolean;
 }) {
   const navigate = Route.useNavigate();
+  const isLinux = useIsLinux();
 
   const handleTabClick = async (tab: TabKey) => {
     if (tab === "feedback") {
@@ -184,7 +187,11 @@ function Group({
         expandHeight && "flex-1",
       ])}
     >
-      {includeTrafficLight && <div data-tauri-drag-region className="h-9" />}
+      {includeTrafficLight && (
+        <div data-tauri-drag-region className="h-9 flex items-center px-3">
+          {isLinux && <TrafficLights />}
+        </div>
+      )}
       {tabs.map((tab) => {
         const tabInfo = info(tab);
         const Icon = tabInfo.icon;
diff --git a/plugins/windows/src/window/v1.rs b/plugins/windows/src/window/v1.rs
index 41d8dd6687..5901a09472 100644
--- a/plugins/windows/src/window/v1.rs
+++ b/plugins/windows/src/window/v1.rs
@@ -132,6 +132,8 @@ impl WindowImpl for AppWindow {
                 let window = self
                     .window_builder(app, "/app/settings")
                     .resizable(true)
+                    .minimizable(true)
+                    .maximizable(true)
                     .min_inner_size(800.0, 600.0)
                     .build()?;