diff --git a/webview-ui/src/components/chat/McpExecution.tsx b/webview-ui/src/components/chat/McpExecution.tsx
index 4d476670fb..8e0882340b 100644
--- a/webview-ui/src/components/chat/McpExecution.tsx
+++ b/webview-ui/src/components/chat/McpExecution.tsx
@@ -313,8 +313,8 @@ const ResponseContainerInternal = ({
 	return (
 		<div
 			className={cn("overflow-hidden", {
-				"max-h-[100%] mt-1 pt-1 border-t border-border/25": hasArguments,
-				"max-h-[100%] mt-1 pt-1": !hasArguments,
+				"max-h-96 overflow-y-auto mt-1 pt-1 border-t border-border/25": hasArguments,
+				"max-h-96 overflow-y-auto mt-1 pt-1": !hasArguments,
 			})}>
 			{isJson ? (
 				<CodeBlock source={response} language="json" />