diff --git a/apps/desktop/src/components/titlebar/Titlebar.tsx b/apps/desktop/src/components/titlebar/Titlebar.tsx
index 7f40448e5..1f4353e07 100644
--- a/apps/desktop/src/components/titlebar/Titlebar.tsx
+++ b/apps/desktop/src/components/titlebar/Titlebar.tsx
@@ -14,13 +14,12 @@ export default function Titlebar() {
   return (
     <header
       class={cx(
-        "flex flex-row items-center select-none space-x-1 shrink-0 border-gray-200 rounded-[inherit]",
+        "flex flex-row items-center z-50 select-none space-x-1 shrink-0 border-gray-200",
         titlebarState.transparent ? "" : "bg-gray-50",
         titlebarState.border ? "border-b" : ""
       )}
       style={{
         height: titlebarState.height,
-        "z-index": "999999",
       }}
       data-tauri-drag-region
     >
diff --git a/apps/desktop/src/routes/(window-chrome)/setup.tsx b/apps/desktop/src/routes/(window-chrome)/setup.tsx
index c75a7dea5..ec76bd3b8 100644
--- a/apps/desktop/src/routes/(window-chrome)/setup.tsx
+++ b/apps/desktop/src/routes/(window-chrome)/setup.tsx
@@ -158,6 +158,7 @@ import { generalSettingsStore } from "~/store";
 import { Portal } from "solid-js/web";
 import { cx } from "cva";
 import { type as ostype } from "@tauri-apps/plugin-os";
+import Titlebar from "~/components/titlebar/Titlebar";
 
 function Startup(props: { onClose: () => void }) {
   const [audioState, setAudioState] = makePersisted(
@@ -287,7 +288,7 @@ function Startup(props: { onClose: () => void }) {
 
   return (
     <Portal>
-      <div class="absolute inset-0 z-50">
+      <div class="absolute inset-0 z-40">
         <style>
           {`
           body {