diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx
index 16331e7..9b44a92 100644
--- a/src/components/Navigation.tsx
+++ b/src/components/Navigation.tsx
@@ -180,8 +180,10 @@ export const ContextSwitcher: Component<{
         }
     };
 
+    const hasContexts = () => (oversightUsers() && oversightUsers()!.length > 0) || store.subscribedBuckets.length > 0;
+
     return (
-        <Show when={oversightUsers() && oversightUsers()!.length > 0}>
+        <Show when={hasContexts()}>
             <Popover open={open()} onOpenChange={setOpen}>
                 <PopoverTrigger class={cn(props.isMobile ? "w-auto" : "w-full")}>
                     <div class={cn(