diff --git a/ui/goose2/src/shared/ui/alert-dialog.tsx b/ui/goose2/src/shared/ui/alert-dialog.tsx
index e2bce14b..1ebcfed9 100644
--- a/ui/goose2/src/shared/ui/alert-dialog.tsx
+++ b/ui/goose2/src/shared/ui/alert-dialog.tsx
@@ -49,11 +49,14 @@ function AlertDialogContent({
   return (
     <AlertDialogPortal>
       <AlertDialogOverlay />
-      <div className="pointer-events-none fixed inset-0 z-[81] grid place-items-center p-4">
+      <div
+        data-slot="alert-dialog-positioner"
+        className="pointer-events-none fixed inset-0 z-[81] grid place-items-center p-4"
+      >
         <AlertDialogPrimitive.Content
           data-slot="alert-dialog-content"
           className={cn(
-            "pointer-events-auto bg-background shadow-modal 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 relative grid w-full max-w-[calc(100vw-2rem)] gap-4 rounded-modal border p-6 duration-200 sm:max-w-lg",
+            "pointer-events-auto relative grid max-h-[calc(100dvh-2rem)] w-full max-w-lg gap-4 overflow-y-auto rounded-modal border bg-background p-6 shadow-modal data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:animate-in data-[state=open]:fade-in-0",
             className,
           )}
           {...props}
diff --git a/ui/goose2/src/shared/ui/dialog.tsx b/ui/goose2/src/shared/ui/dialog.tsx
index b7c105d4..7747a95a 100644
--- a/ui/goose2/src/shared/ui/dialog.tsx
+++ b/ui/goose2/src/shared/ui/dialog.tsx
@@ -55,11 +55,14 @@ function DialogContent({
   return (
     <DialogPortal data-slot="dialog-portal">
       <DialogOverlay />
-      <div className="pointer-events-none fixed inset-0 z-[61] grid place-items-center p-4">
+      <div
+        data-slot="dialog-positioner"
+        className="pointer-events-none fixed inset-0 z-[61] grid place-items-center p-4"
+      >
         <DialogPrimitive.Content
           data-slot="dialog-content"
           className={cn(
-            "pointer-events-auto bg-background shadow-modal 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 relative grid w-full max-w-[calc(100vw-2rem)] gap-4 rounded-modal border p-6 duration-200 sm:max-w-lg",
+            "pointer-events-auto relative grid max-h-[calc(100dvh-2rem)] w-full max-w-lg gap-4 overflow-y-auto rounded-modal border bg-background p-6 shadow-modal data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:animate-in data-[state=open]:fade-in-0",
             className,
           )}
           {...props}