diff --git a/src/components/FeedSwitcher/index.tsx b/src/components/FeedSwitcher/index.tsx
index bb034242..d9c76593 100644
--- a/src/components/FeedSwitcher/index.tsx
+++ b/src/components/FeedSwitcher/index.tsx
@@ -16,7 +16,7 @@ export default function FeedSwitcher({ close }: { close?: () => void }) {
   const { feedInfo, switchFeed } = useFeed()
 
   return (
-    <div className="space-y-4">
+    <div className="space-y-2">
       {pubkey && (
         <FeedSwitcherItem
           isActive={feedInfo.feedType === 'following'}
@@ -53,46 +53,44 @@ export default function FeedSwitcher({ close }: { close?: () => void }) {
         </FeedSwitcherItem>
       )}
 
-      <div className="space-y-2">
-        <div className="flex justify-end items-center text-sm">
-          <SecondaryPageLink
-            to={toRelaySettings()}
-            className="text-primary font-semibold"
-            onClick={() => close?.()}
-          >
-            {t('edit')}
-          </SecondaryPageLink>
-        </div>
-        {relaySets
-          .filter((set) => set.relayUrls.length > 0)
-          .map((set) => (
-            <RelaySetCard
-              key={set.id}
-              relaySet={set}
-              select={feedInfo.feedType === 'relays' && set.id === feedInfo.id}
-              onSelectChange={(select) => {
-                if (!select) return
-                switchFeed('relays', { activeRelaySetId: set.id })
-                close?.()
-              }}
-            />
-          ))}
-        {favoriteRelays.map((relay) => (
-          <FeedSwitcherItem
-            key={relay}
-            isActive={feedInfo.feedType === 'relay' && feedInfo.id === relay}
-            onClick={() => {
-              switchFeed('relay', { relay })
+      <div className="flex justify-end items-center text-sm">
+        <SecondaryPageLink
+          to={toRelaySettings()}
+          className="text-primary font-semibold"
+          onClick={() => close?.()}
+        >
+          {t('edit')}
+        </SecondaryPageLink>
+      </div>
+      {relaySets
+        .filter((set) => set.relayUrls.length > 0)
+        .map((set) => (
+          <RelaySetCard
+            key={set.id}
+            relaySet={set}
+            select={feedInfo.feedType === 'relays' && set.id === feedInfo.id}
+            onSelectChange={(select) => {
+              if (!select) return
+              switchFeed('relays', { activeRelaySetId: set.id })
               close?.()
             }}
-          >
-            <div className="flex gap-2 items-center w-full">
-              <RelayIcon url={relay} />
-              <div className="flex-1 w-0 truncate">{simplifyUrl(relay)}</div>
-            </div>
-          </FeedSwitcherItem>
+          />
         ))}
-      </div>
+      {favoriteRelays.map((relay) => (
+        <FeedSwitcherItem
+          key={relay}
+          isActive={feedInfo.feedType === 'relay' && feedInfo.id === relay}
+          onClick={() => {
+            switchFeed('relay', { relay })
+            close?.()
+          }}
+        >
+          <div className="flex gap-2 items-center w-full">
+            <RelayIcon url={relay} />
+            <div className="flex-1 w-0 truncate">{simplifyUrl(relay)}</div>
+          </div>
+        </FeedSwitcherItem>
+      ))}
     </div>
   )
 }
diff --git a/src/components/NoteOptions/MobileMenu.tsx b/src/components/NoteOptions/MobileMenu.tsx
index 60b1b8c2..a2e66ceb 100644
--- a/src/components/NoteOptions/MobileMenu.tsx
+++ b/src/components/NoteOptions/MobileMenu.tsx
@@ -31,7 +31,7 @@ export function MobileMenu({
       {trigger}
       <Drawer open={isDrawerOpen} onOpenChange={setIsDrawerOpen}>
         <DrawerOverlay onClick={closeDrawer} />
-        <DrawerContent hideOverlay className="max-h-screen">
+        <DrawerContent hideOverlay className="max-h-[80vh]">
           <div className="overflow-y-auto overscroll-contain py-2" style={{ touchAction: 'pan-y' }}>
             {!showSubMenu ? (
               menuActions.map((action, index) => {
diff --git a/src/components/PostEditor/PostRelaySelector.tsx b/src/components/PostEditor/PostRelaySelector.tsx
index 922eb833..884deae9 100644
--- a/src/components/PostEditor/PostRelaySelector.tsx
+++ b/src/components/PostEditor/PostRelaySelector.tsx
@@ -218,7 +218,14 @@ export default function PostRelaySelector({
         </div>
         <Drawer open={isDrawerOpen} onOpenChange={setIsDrawerOpen}>
           <DrawerOverlay onClick={() => setIsDrawerOpen(false)} />
-          <DrawerContent hideOverlay>{content}</DrawerContent>
+          <DrawerContent className="max-h-[80vh]" hideOverlay>
+            <div
+              className="overflow-y-auto overscroll-contain py-2"
+              style={{ touchAction: 'pan-y' }}
+            >
+              {content}
+            </div>
+          </DrawerContent>
         </Drawer>
       </>
     )
diff --git a/src/components/ui/drawer.tsx b/src/components/ui/drawer.tsx
index 3c5a08cd..03ba1ae9 100644
--- a/src/components/ui/drawer.tsx
+++ b/src/components/ui/drawer.tsx
@@ -85,7 +85,7 @@ const DrawerContent = React.forwardRef<
       onOpenAutoFocus={(e) => e.preventDefault()}
       {...props}
     >
-      <div className="mx-auto mt-4 h-2 w-[100px] rounded-full bg-muted" />
+      <div className="mx-auto mt-4 pb-2 mb-2 h-2 w-[100px] rounded-full bg-muted" />
       {children}
     </DrawerPrimitive.Content>
   </DrawerPortal>
diff --git a/src/pages/primary/NoteListPage/FeedButton.tsx b/src/pages/primary/NoteListPage/FeedButton.tsx
index b9581d78..c3389586 100644
--- a/src/pages/primary/NoteListPage/FeedButton.tsx
+++ b/src/pages/primary/NoteListPage/FeedButton.tsx
@@ -20,7 +20,10 @@ export default function FeedButton({ className }: { className?: string }) {
         <FeedSwitcherTrigger className={className} onClick={() => setOpen(true)} />
         <Drawer open={open} onOpenChange={setOpen}>
           <DrawerContent className="max-h-[80vh]">
-            <div className="py-4 px-2 overflow-auto">
+            <div
+              className="overflow-y-auto overscroll-contain py-2 px-4"
+              style={{ touchAction: 'pan-y' }}
+            >
               <FeedSwitcher close={() => setOpen(false)} />
             </div>
           </DrawerContent>