From 81c1a1da9c82cf450856fdadd39a611deb201f77 Mon Sep 17 00:00:00 2001
From: Laurence <laurence.jones@live.co.uk>
Date: Thu, 26 Feb 2026 15:45:41 +0000
Subject: [PATCH 1/2] enhance(sidebar): make mobile org selector sticky

  Make org selector sticky on mobile sidebar

  Move OrgSelector outside the scrollable container so it stays fixed
  at the top while menu items scroll, matching the desktop sidebar
  behavior introduced in 9b2c0d0b.
---
 src/components/LayoutMobileMenu.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/LayoutMobileMenu.tsx b/src/components/LayoutMobileMenu.tsx
index b661d780a..c453be72f 100644
--- a/src/components/LayoutMobileMenu.tsx
+++ b/src/components/LayoutMobileMenu.tsx
@@ -69,14 +69,14 @@ export function LayoutMobileMenu({
                                     <SheetDescription className="sr-only">
                                         {t("navbarDescription")}
                                     </SheetDescription>
+                                    <div className="px-1 shrink-0">
+                                        <OrgSelector
+                                            orgId={orgId}
+                                            orgs={orgs}
+                                        />
+                                    </div>
+                                    <div className="w-full border-b border-border" />
                                     <div className="flex-1 overflow-y-auto relative">
-                                        <div className="px-1">
-                                            <OrgSelector
-                                                orgId={orgId}
-                                                orgs={orgs}
-                                            />
-                                        </div>
-                                        <div className="w-full border-b border-border" />
                                         <div className="px-3 pt-3">
                                             {!isAdminPage &&
                                                 user.serverAdmin && (

From c20babcb53ae502d2f2dd5d60c3d6bcd08954bc5 Mon Sep 17 00:00:00 2001
From: miloschwartz <mschwartz10612@gmail.com>
Date: Sun, 1 Mar 2026 11:13:49 -0800
Subject: [PATCH 2/2] fix org selector spacing on mobile

---
 src/components/LayoutMobileMenu.tsx | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/LayoutMobileMenu.tsx b/src/components/LayoutMobileMenu.tsx
index c453be72f..e1c883a2b 100644
--- a/src/components/LayoutMobileMenu.tsx
+++ b/src/components/LayoutMobileMenu.tsx
@@ -69,15 +69,16 @@ export function LayoutMobileMenu({
                                     <SheetDescription className="sr-only">
                                         {t("navbarDescription")}
                                     </SheetDescription>
-                                    <div className="px-1 shrink-0">
-                                        <OrgSelector
-                                            orgId={orgId}
-                                            orgs={orgs}
-                                        />
+                                    <div className="w-full border-b border-border">
+                                        <div className="px-1 shrink-0">
+                                            <OrgSelector
+                                                orgId={orgId}
+                                                orgs={orgs}
+                                            />
+                                        </div>
                                     </div>
-                                    <div className="w-full border-b border-border" />
                                     <div className="flex-1 overflow-y-auto relative">
-                                        <div className="px-3 pt-3">
+                                        <div className="px-3">
                                             {!isAdminPage &&
                                                 user.serverAdmin && (
                                                     <div className="mb-1">