diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx
index a401302..7843682 100644
--- a/src/components/Navigation.tsx
+++ b/src/components/Navigation.tsx
@@ -339,15 +339,7 @@ export const Sidebar: Component<{
                 </Show>
             </div>
 
-            {/* Context Switcher - Only visible if there are oversight contexts */}
-            <div class={cn("px-3 mb-2", !props.isLocked && !props.isPeeking && "hidden")}>
-                <ContextSwitcher
-                    isLocked={props.isLocked}
-                    isPeeking={props.isPeeking}
-                    setIsPeeking={props.setIsPeeking}
-                    onOpenChange={setSwitcherOpen}
-                />
-            </div>
+
 
             <nav class="flex-1 px-3 space-y-1 mt-2">
                 <For each={desktopNavItems}>
@@ -367,6 +359,20 @@ export const Sidebar: Component<{
                     )}
                 </For>
             </nav>
+
+            {/* Context Switcher - Only visible if there are oversight contexts */}
+            <div class={cn(
+                "px-3 mb-2 transition-opacity duration-200",
+                (!props.isLocked && !props.isPeeking) ? "opacity-0 pointer-events-none" : "opacity-100 delay-100"
+            )}>
+                <ContextSwitcher
+                    isLocked={props.isLocked}
+                    isPeeking={props.isPeeking}
+                    setIsPeeking={props.setIsPeeking}
+                    onOpenChange={setSwitcherOpen}
+                />
+            </div>
+
             <div class="p-3 border-t border-border mt-auto">
                 <button
                     onClick={() => props.setView("settings")}