diff --git a/src/design-system/organisms/app-shell/AppShell.tsx b/src/design-system/organisms/app-shell/AppShell.tsx
index a283b78..8c4eea8 100644
--- a/src/design-system/organisms/app-shell/AppShell.tsx
+++ b/src/design-system/organisms/app-shell/AppShell.tsx
@@ -13,6 +13,7 @@ export type AppShellProps = {
     small?: boolean;
     activeGuildId?: string | null;
     guilds?: GuildSlug[];
+    disableGuildPicker?: boolean;
 };
 
 export const AppShell = (props: AppShellProps) => (
@@ -21,6 +22,7 @@ export const AppShell = (props: AppShellProps) => (
         <GlobalStyleColors />
         {props.user ? (
             <Masthead.Authed
+                disableGuildPicker={props.disableGuildPicker}
                 guilds={props.guilds || []}
                 activeGuildId={props.activeGuildId || null}
                 user={props.user}
diff --git a/src/design-system/organisms/masthead/Authed.tsx b/src/design-system/organisms/masthead/Authed.tsx
index c0397bf..5d5e34a 100644
--- a/src/design-system/organisms/masthead/Authed.tsx
+++ b/src/design-system/organisms/masthead/Authed.tsx
@@ -22,6 +22,7 @@ type Props = {
     user?: DiscordUser;
     activeGuildId: string | null;
     guilds: GuildSlug[];
+    disableGuildPicker?: boolean;
 };
 
 export const Authed = (props: Props) => {
@@ -39,8 +40,10 @@ export const Authed = (props: Props) => {
                     </Link>
                     <InteractionBase
                         onClick={() => {
-                            setServerPopoverState(true);
-                            setUserPopoverState(false);
+                            if (!props.disableGuildPicker) {
+                                setServerPopoverState(true);
+                                setUserPopoverState(false);
+                            }
                         }}
                         hide={!serverPopoverState}
                     >