diff --git a/frontend/src/components/agents/mcp/custom-mcp-dialog.tsx b/frontend/src/components/agents/mcp/custom-mcp-dialog.tsx
index 9fa93cb4..2e1f0472 100644
--- a/frontend/src/components/agents/mcp/custom-mcp-dialog.tsx
+++ b/frontend/src/components/agents/mcp/custom-mcp-dialog.tsx
@@ -248,8 +248,7 @@ export const CustomMCPDialog: React.FC<CustomMCPDialogProps> = ({
             </div>
           </div>
         </DialogHeader>
-
-        <div className="flex-1 overflow-hidden flex flex-col">
+        <div className="flex-1 overflow-y-auto max-h-[60vh] flex flex-col">
           {step === 'setup' ? (
             <div className="space-y-6 p-1 flex-1">
               <div className="space-y-4">