diff --git a/src/lib/components/accounts/tests/__snapshots__/UserMenu.test.ts.snap b/src/lib/components/accounts/tests/__snapshots__/UserMenu.test.ts.snap
index e3e6ba138..db9a07916 100644
--- a/src/lib/components/accounts/tests/__snapshots__/UserMenu.test.ts.snap
+++ b/src/lib/components/accounts/tests/__snapshots__/UserMenu.test.ts.snap
@@ -61,7 +61,7 @@ exports[`UserMenu 1`] = `
     style="left: 0px; top: 0px;"
   >
     <div
-      class="menu svelte-1tmvwy9"
+      class="menu svelte-ei6d2h"
       role="menu"
     >
       <a
diff --git a/src/lib/components/common/Menu.svelte b/src/lib/components/common/Menu.svelte
index ba7ae4f67..2b8146f9c 100644
--- a/src/lib/components/common/Menu.svelte
+++ b/src/lib/components/common/Menu.svelte
@@ -17,6 +17,8 @@
     padding: 0.25rem;
     gap: 0.25rem;
     min-width: 16rem;
+    max-height: var(--max-height, auto);
+    overflow-y: scroll;
   }
   :global(.menu.small) {
     color: var(--gray-3);
diff --git a/src/lib/components/navigation/OrgMenu.svelte b/src/lib/components/navigation/OrgMenu.svelte
index baf05a2c3..5c0c174a8 100644
--- a/src/lib/components/navigation/OrgMenu.svelte
+++ b/src/lib/components/navigation/OrgMenu.svelte
@@ -177,7 +177,7 @@
             <p class="orgname">{active_org.name}</p>
             <span class="arrow" slot="end"><ChevronDown12 /></span>
           </SidebarItem>
-          <Menu>
+          <Menu --max-height="24rem">
             {#each otherOrgs as otherOrg}
               <SidebarItem
                 hover
@@ -225,7 +225,6 @@
     color: var(--black, #233944);
     font-family: var(--font-sans, "Source Sans Pro");
     font-weight: var(--font-semibold, 600);
-    line-height: 1rem;
     margin-bottom: 0;
   }
 
diff --git a/src/lib/components/navigation/stories/OrgMenu.stories.svelte b/src/lib/components/navigation/stories/OrgMenu.stories.svelte
index 78f02d9bc..ccf687b01 100644
--- a/src/lib/components/navigation/stories/OrgMenu.stories.svelte
+++ b/src/lib/components/navigation/stories/OrgMenu.stories.svelte
@@ -15,9 +15,6 @@
   export const meta = {
     title: "Components / Navigation / Org Menu",
     component: OrgMenu,
-    parameters: {
-      layout: "centered",
-    },
   };
 </script>