diff --git a/web/src/lib/components/explorer/AiCleanupDialog.svelte b/web/src/lib/components/explorer/AiCleanupDialog.svelte
index 1e3792db..9ef641d1 100644
--- a/web/src/lib/components/explorer/AiCleanupDialog.svelte
+++ b/web/src/lib/components/explorer/AiCleanupDialog.svelte
@@ -225,7 +225,7 @@
 <AppDialog
   bind:open
   title={i18n.t("label-ai-cleanup-title")}
-  class="grid! sm:max-w-2xl max-h-[90vh] grid-rows-[auto_minmax(0,1fr)_auto] overflow-hidden {GAP_WIDE}"
+  class="sm:max-w-2xl {GAP_WIDE}"
   onOpenChange={handleOpenChange}
 >
   {#if phase === "loading"}
@@ -234,7 +234,7 @@
       <span class="text-sm">{i18n.t("label-ai-cleanup-loading")}</span>
     </div>
   {:else if phase === "select"}
-    <div class="flex min-h-0 flex-col {GAP_LOOSE} overflow-hidden">
+    <div class="flex min-h-0 flex-1 flex-col {GAP_LOOSE} overflow-hidden">
       <div class="flex flex-wrap items-center justify-between {GAP}">
         <h3 class="text-sm font-medium">{i18n.t("label-ai-cleanup-select")}</h3>
         <div class="flex flex-wrap {GAP_TIGHT}">
@@ -290,7 +290,7 @@
       </div>
     </div>
   {:else if phase === "diff" && pendingCleanup}
-    <div class="flex min-h-0 flex-col {GAP_LOOSE} overflow-hidden">
+    <div class="flex min-h-0 flex-1 flex-col {GAP_LOOSE} overflow-hidden">
       <div class="flex flex-wrap items-center justify-between {GAP}">
         <span class="text-xs text-muted-foreground">
           {i18n.t("label-ai-cleanup-changes-selected", {
diff --git a/web/src/lib/components/ui/app-dialog.svelte b/web/src/lib/components/ui/app-dialog.svelte
index 8ced3e5d..2f2d6473 100644
--- a/web/src/lib/components/ui/app-dialog.svelte
+++ b/web/src/lib/components/ui/app-dialog.svelte
@@ -27,12 +27,14 @@
 </script>
 
 <Dialog bind:open {onOpenChange} class={className} {showCloseButton}>
-  <DialogHeader>
+  <DialogHeader class="shrink-0 pe-10">
     <DialogTitle>{title}</DialogTitle>
   </DialogHeader>
-  {@render children?.()}
+  <div class="flex min-h-0 flex-1 flex-col overflow-y-auto">
+    {@render children?.()}
+  </div>
   {#if footer}
-    <DialogFooter>
+    <DialogFooter class="shrink-0">
       {@render footer()}
     </DialogFooter>
   {/if}
diff --git a/web/src/lib/components/ui/dialog.svelte b/web/src/lib/components/ui/dialog.svelte
index 2d690100..ca502ff6 100644
--- a/web/src/lib/components/ui/dialog.svelte
+++ b/web/src/lib/components/ui/dialog.svelte
@@ -34,7 +34,7 @@
     />
     <DialogPrimitive.Content
       class={cn(
-        "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 ring-foreground/5 dark:ring-foreground/10 grid max-w-[calc(100%-2rem)] gap-6 rounded-[min(var(--radius-4xl),24px)] p-6 text-sm shadow-xl ring-1 duration-100 sm:max-w-md fixed top-1/2 left-1/2 z-50 w-full -translate-x-1/2 -translate-y-1/2 outline-none [--floating-label-bg:var(--popover)]",
+        "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 ring-foreground/5 dark:ring-foreground/10 flex max-h-[calc(100dvh-2rem)] max-w-[calc(100%-2rem)] flex-col gap-6 overflow-hidden rounded-[min(var(--radius-4xl),24px)] p-6 text-sm shadow-xl ring-1 duration-100 sm:max-w-md fixed top-1/2 left-1/2 z-50 w-full -translate-x-1/2 -translate-y-1/2 outline-none [--floating-label-bg:var(--popover)]",
         className
       )}
     >
@@ -45,7 +45,7 @@
             <Button
               {...props}
               variant="ghost"
-              class="bg-secondary absolute top-4 right-4"
+              class="bg-secondary absolute top-4 right-4 z-10"
               size="icon-sm"
             >
               <XIcon />