diff --git a/desktop/src/features/agents/ui/AddAgentToChannelDialog.tsx b/desktop/src/features/agents/ui/AddAgentToChannelDialog.tsx
index 9644ffd8ca..f8e1c9dfe4 100644
--- a/desktop/src/features/agents/ui/AddAgentToChannelDialog.tsx
+++ b/desktop/src/features/agents/ui/AddAgentToChannelDialog.tsx
@@ -112,7 +112,7 @@ export function AddAgentToChannelDialog({
     <Dialog onOpenChange={handleOpenChange} open={open}>
       <DialogContent className="max-w-xl overflow-hidden p-0">
         <div className="flex max-h-[85vh] flex-col">
-          <DialogHeader className="border-b border-border/60 px-6 py-5 pr-14">
+          <DialogHeader className="shrink-0 border-b border-border/60 px-6 py-5 pr-14">
             <DialogTitle>Add agent to channel</DialogTitle>
             <DialogDescription>
               Add {agent?.name ?? "this agent"} to a channel so desktop chat can
@@ -122,7 +122,7 @@ export function AddAgentToChannelDialog({
             </DialogDescription>
           </DialogHeader>
 
-          <div className="space-y-5 px-6 py-5">
+          <div className="min-h-0 flex-1 space-y-5 overflow-y-auto px-6 py-5">
             <div className="space-y-1.5">
               <label className="text-sm font-medium" htmlFor="agent-channel-id">
                 Channel
@@ -208,7 +208,7 @@ export function AddAgentToChannelDialog({
             ) : null}
           </div>
 
-          <div className="flex justify-end gap-2 border-t border-border/60 px-6 py-4">
+          <div className="flex shrink-0 justify-end gap-2 border-t border-border/60 px-6 py-4">
             <Button
               onClick={() => handleOpenChange(false)}
               size="sm"
diff --git a/desktop/src/features/agents/ui/AddTeamToChannelDialog.tsx b/desktop/src/features/agents/ui/AddTeamToChannelDialog.tsx
index 64c59bbe8a..4cb3951f80 100644
--- a/desktop/src/features/agents/ui/AddTeamToChannelDialog.tsx
+++ b/desktop/src/features/agents/ui/AddTeamToChannelDialog.tsx
@@ -153,7 +153,7 @@ export function AddTeamToChannelDialog({
     <Dialog onOpenChange={handleOpenChange} open={open}>
       <DialogContent className="max-w-xl overflow-hidden p-0">
         <div className="flex max-h-[85vh] flex-col">
-          <DialogHeader className="border-b border-border/60 px-6 py-5 pr-14">
+          <DialogHeader className="shrink-0 border-b border-border/60 px-6 py-5 pr-14">
             <DialogTitle>Deploy team to channel</DialogTitle>
             <DialogDescription>
               Create and attach one agent per persona in{" "}
@@ -162,7 +162,7 @@ export function AddTeamToChannelDialog({
             </DialogDescription>
           </DialogHeader>
 
-          <div className="space-y-5 px-6 py-5">
+          <div className="min-h-0 flex-1 space-y-5 overflow-y-auto px-6 py-5">
             {resolved.length > 0 ? (
               <div className="space-y-1.5">
                 <span className="text-sm font-medium">
@@ -267,7 +267,7 @@ export function AddTeamToChannelDialog({
             ) : null}
           </div>
 
-          <div className="flex justify-end gap-2 border-t border-border/60 px-6 py-4">
+          <div className="flex shrink-0 justify-end gap-2 border-t border-border/60 px-6 py-4">
             <Button
               onClick={() => handleOpenChange(false)}
               size="sm"
diff --git a/desktop/src/features/agents/ui/BatchImportDialog.tsx b/desktop/src/features/agents/ui/BatchImportDialog.tsx
index a481698dab..5fb539ac6d 100644
--- a/desktop/src/features/agents/ui/BatchImportDialog.tsx
+++ b/desktop/src/features/agents/ui/BatchImportDialog.tsx
@@ -131,7 +131,7 @@ export function BatchImportDialog({
     <Dialog onOpenChange={onOpenChange} open={open}>
       <DialogContent className="max-w-2xl overflow-hidden p-0">
         <div className="flex max-h-[85vh] flex-col">
-          <DialogHeader className="border-b border-border/60 px-6 py-5 pr-14">
+          <DialogHeader className="shrink-0 border-b border-border/60 px-6 py-5 pr-14">
             <DialogTitle>Import Personas</DialogTitle>
             <DialogDescription>
               Found {personas.length} persona
@@ -139,7 +139,7 @@ export function BatchImportDialog({
             </DialogDescription>
           </DialogHeader>
 
-          <div className="flex-1 overflow-y-auto px-6 py-4">
+          <div className="min-h-0 flex-1 overflow-y-auto px-6 py-4">
             <div className="space-y-1">
               {personas.map((persona, index) => {
                 const isExpanded = expandedIndex === index;
@@ -245,7 +245,7 @@ export function BatchImportDialog({
             ) : null}
           </div>
 
-          <div className="flex justify-end gap-2 border-t border-border/60 px-6 py-4">
+          <div className="flex shrink-0 justify-end gap-2 border-t border-border/60 px-6 py-4">
             <Button
               onClick={() => onOpenChange(false)}
               size="sm"
diff --git a/desktop/src/features/agents/ui/CreateAgentDialog.tsx b/desktop/src/features/agents/ui/CreateAgentDialog.tsx
index fd2106faea..e0d85131f8 100644
--- a/desktop/src/features/agents/ui/CreateAgentDialog.tsx
+++ b/desktop/src/features/agents/ui/CreateAgentDialog.tsx
@@ -384,7 +384,7 @@ export function CreateAgentDialog({
     <Dialog onOpenChange={handleOpenChange} open={open}>
       <DialogContent className="max-w-3xl overflow-hidden p-0">
         <div className="flex max-h-[85vh] flex-col">
-          <DialogHeader className="border-b border-border/60 px-6 py-5 pr-14">
+          <DialogHeader className="shrink-0 border-b border-border/60 px-6 py-5 pr-14">
             <DialogTitle>Create agent</DialogTitle>
             <DialogDescription>
               This creates a local agent identity, syncs its display name when
@@ -393,7 +393,7 @@ export function CreateAgentDialog({
             </DialogDescription>
           </DialogHeader>
 
-          <div className="flex-1 space-y-5 overflow-y-auto px-6 py-5">
+          <div className="min-h-0 flex-1 space-y-5 overflow-y-auto px-6 py-5">
             <CreateAgentBasicsFields name={name} onNameChange={setName} />
 
             {/* Run on selector — only shown when backend providers are discovered */}
@@ -573,7 +573,7 @@ export function CreateAgentDialog({
             ) : null}
           </div>
 
-          <div className="flex justify-end gap-2 border-t border-border/60 px-6 py-4">
+          <div className="flex shrink-0 justify-end gap-2 border-t border-border/60 px-6 py-4">
             <Button
               onClick={() => handleOpenChange(false)}
               size="sm"
diff --git a/desktop/src/features/agents/ui/PersonaDialog.tsx b/desktop/src/features/agents/ui/PersonaDialog.tsx
index 89d8c79766..63771dd8cb 100644
--- a/desktop/src/features/agents/ui/PersonaDialog.tsx
+++ b/desktop/src/features/agents/ui/PersonaDialog.tsx
@@ -101,12 +101,12 @@ export function PersonaDialog({
     <Dialog onOpenChange={handleOpenChange} open={open}>
       <DialogContent className="max-w-2xl overflow-hidden p-0">
         <div className="flex max-h-[85vh] flex-col">
-          <DialogHeader className="border-b border-border/60 px-6 py-5 pr-14">
+          <DialogHeader className="shrink-0 border-b border-border/60 px-6 py-5 pr-14">
             <DialogTitle>{title}</DialogTitle>
             <DialogDescription>{description}</DialogDescription>
           </DialogHeader>
 
-          <div className="space-y-5 overflow-y-auto px-6 py-5">
+          <div className="min-h-0 flex-1 space-y-5 overflow-y-auto px-6 py-5">
             <div className="space-y-1.5">
               <label
                 className="text-sm font-medium"
@@ -219,7 +219,7 @@ export function PersonaDialog({
             ) : null}
           </div>
 
-          <div className="flex justify-end gap-2 border-t border-border/60 px-6 py-4">
+          <div className="flex shrink-0 justify-end gap-2 border-t border-border/60 px-6 py-4">
             <Button
               onClick={() => handleOpenChange(false)}
               size="sm"
diff --git a/desktop/src/features/agents/ui/TeamDialog.tsx b/desktop/src/features/agents/ui/TeamDialog.tsx
index 9ae2471b83..e966e69891 100644
--- a/desktop/src/features/agents/ui/TeamDialog.tsx
+++ b/desktop/src/features/agents/ui/TeamDialog.tsx
@@ -100,12 +100,12 @@ export function TeamDialog({
     <Dialog onOpenChange={handleOpenChange} open={open}>
       <DialogContent className="max-w-2xl overflow-hidden p-0">
         <div className="flex max-h-[85vh] flex-col">
-          <DialogHeader className="border-b border-border/60 px-6 py-5 pr-14">
+          <DialogHeader className="shrink-0 border-b border-border/60 px-6 py-5 pr-14">
             <DialogTitle>{title}</DialogTitle>
             <DialogDescription>{description}</DialogDescription>
           </DialogHeader>
 
-          <div className="flex-1 space-y-5 overflow-y-auto px-6 py-5">
+          <div className="min-h-0 flex-1 space-y-5 overflow-y-auto px-6 py-5">
             <div className="space-y-1.5">
               <label className="text-sm font-medium" htmlFor="team-name">
                 Name
@@ -205,7 +205,7 @@ export function TeamDialog({
             ) : null}
           </div>
 
-          <div className="flex justify-end gap-2 border-t border-border/60 px-6 py-4">
+          <div className="flex shrink-0 justify-end gap-2 border-t border-border/60 px-6 py-4">
             <Button
               onClick={() => handleOpenChange(false)}
               size="sm"