diff --git a/templates/base.gohtml b/templates/base.gohtml
index 4040e8c..7cb9211 100644
--- a/templates/base.gohtml
+++ b/templates/base.gohtml
@@ -313,6 +313,28 @@ if (window.showToast) showToast({ message: 'Something went wrong' })
             {{template "navigation" dict "CurrentPath" .CurrentPath}}
           {{end}}
         </div>
+
+        <div class="fixed inset-0 z-[60] hidden items-start justify-center bg-black/50 px-4 pt-[12vh]" data-command-palette-dialog aria-hidden="true">
+          <div class="w-full max-w-2xl overflow-hidden bg-background-button shadow-soft ring-1 ring-border" data-command-palette-root role="dialog" aria-modal="true" aria-label="Command palette">
+            <label for="command-palette-input" class="sr-only">Search commands and anime</label>
+            <div class="flex items-center border-b border-border">
+              <svg class="mx-4 size-5 shrink-0 text-foreground-muted" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round">
+                <circle cx="11" cy="11" r="8" />
+                <path d="m21 21-4.35-4.35" />
+              </svg>
+              <input
+                id="command-palette-input"
+                name="q"
+                type="search"
+                autocomplete="off"
+                placeholder="Search or jump to..."
+                class="min-w-0 flex-1 bg-transparent py-4 pr-4 text-base text-foreground placeholder:text-foreground-muted outline-none"
+              />
+              <button type="button" data-unstyled-button class="mr-3 px-2 py-1 text-xs text-foreground-muted transition-colors hover:text-foreground" data-command-palette-close>Esc</button>
+            </div>
+            <div data-command-palette-results class="max-h-[min(70vh,34rem)] overflow-y-auto py-2"></div>
+          </div>
+        </div>
   
         <main class="w-full flex-1 flex flex-col h-[calc(100dvh-3.5rem)] overflow-y-auto lg:h-screen">
           <div class="flex-1 p-4 md:p-8">
diff --git a/templates/components/navigation.gohtml b/templates/components/navigation.gohtml
index 9680cad..186e808 100644
--- a/templates/components/navigation.gohtml
+++ b/templates/components/navigation.gohtml
@@ -23,28 +23,6 @@
       </div>
     </button>
 
-    <div class="fixed inset-0 z-50 hidden items-start justify-center bg-black/50 px-4 pt-[12vh]" data-command-palette-dialog aria-hidden="true">
-      <div class="w-full max-w-2xl overflow-hidden bg-background-button shadow-soft ring-1 ring-border" data-command-palette-root role="dialog" aria-modal="true" aria-label="Command palette">
-        <label for="command-palette-input" class="sr-only">Search commands and anime</label>
-        <div class="flex items-center border-b border-border">
-          <svg class="mx-4 size-5 shrink-0 text-foreground-muted" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round">
-            <circle cx="11" cy="11" r="8" />
-            <path d="m21 21-4.35-4.35" />
-          </svg>
-          <input
-            id="command-palette-input"
-            name="q"
-            type="search"
-            autocomplete="off"
-            placeholder="Search or jump to..."
-            class="min-w-0 flex-1 bg-transparent py-4 pr-4 text-base text-foreground placeholder:text-foreground-muted outline-none"
-          />
-          <button type="button" data-unstyled-button class="mr-3 px-2 py-1 text-xs text-foreground-muted transition-colors hover:text-foreground" data-command-palette-close>Esc</button>
-        </div>
-        <div data-command-palette-results class="max-h-[min(70vh,34rem)] overflow-y-auto py-2"></div>
-      </div>
-    </div>
-
     {{/* Home */}}
     {{$isActive := eq $currentPath "/"}}
     <a href="/" class="group relative flex items-center px-7 py-3 transition-colors hover:bg-surface-hover" {{if $isCollapsed}}title="Home"{{end}}>