diff --git a/src/components/feed/PostDetailDialog.tsx b/src/components/feed/PostDetailDialog.tsx
index c8923fa..609d002 100644
--- a/src/components/feed/PostDetailDialog.tsx
+++ b/src/components/feed/PostDetailDialog.tsx
@@ -295,7 +295,7 @@ export function PostDetailDialog({ post, open, onClose, onDeleted }: PostDetailD
         */}
         <DialogContent
           showCloseButton={false}
-          className="p-0 max-w-[960px] sm:max-w-[960px] w-full h-[90dvh] flex flex-col md:flex-row overflow-hidden rounded-xl gap-0"
+          className="p-0 max-w-[960px] sm:max-w-[960px] w-full max-h-[90dvh] md:h-[90dvh] flex flex-col md:flex-row overflow-hidden rounded-xl gap-0"
         >
           {/* Mobile-only header — sits above the image on small screens */}
           <div className="md:hidden flex items-center gap-3 px-4 py-3 border-b shrink-0">
@@ -308,14 +308,14 @@ export function PostDetailDialog({ post, open, onClose, onDeleted }: PostDetailD
           </div>
 
           {/* Right panel: desktop header + scrollable body + sticky input */}
-          <div className="flex flex-col md:w-[360px] md:shrink-0 min-h-0 flex-1 md:flex-none md:border-l">
+          <div className="flex flex-col md:w-[360px] md:shrink-0 min-h-0 md:flex-none md:border-l">
             {/* Desktop-only header */}
             <div className="hidden md:flex items-center gap-3 px-4 py-3 border-b shrink-0">
               {headerInner}
             </div>
 
             {/* Scrollable body */}
-            <div className="flex-1 overflow-y-auto min-h-0">
+            <div className="overflow-y-auto min-h-0 max-h-[30dvh] md:max-h-none md:flex-1">
               <div className="px-4 pt-3 pb-2 space-y-2">
                 {isEditingCaption ? (
                   <div className="space-y-2">