diff --git a/apps/code/src/renderer/components/action-selector/ActionSelector.tsx b/apps/code/src/renderer/components/action-selector/ActionSelector.tsx
index 21cb94f8e..cd9120264 100644
--- a/apps/code/src/renderer/components/action-selector/ActionSelector.tsx
+++ b/apps/code/src/renderer/components/action-selector/ActionSelector.tsx
@@ -216,7 +216,7 @@ export function ActionSelector({
       style={{
         outline: "none",
       }}
-      className="rounded-(--radius-3) border border-(--gray-6) bg-(--gray-1)"
+      className="max-h-[50vh] overflow-y-auto rounded-(--radius-3) border border-(--gray-6) bg-(--gray-1)"
     >
       <Flex direction="column" gap="2">
         {hasSteps && steps && (
diff --git a/apps/code/src/renderer/components/permissions/ExecutePermission.tsx b/apps/code/src/renderer/components/permissions/ExecutePermission.tsx
index b7066b9fe..61bfe8324 100644
--- a/apps/code/src/renderer/components/permissions/ExecutePermission.tsx
+++ b/apps/code/src/renderer/components/permissions/ExecutePermission.tsx
@@ -1,5 +1,5 @@
 import { ActionSelector } from "@components/ActionSelector";
-import { Box, Code } from "@radix-ui/themes";
+import { Code } from "@radix-ui/themes";
 import { compactHomePath } from "@utils/path";
 import {
   type BasePermissionProps,
@@ -20,15 +20,13 @@ export function ExecutePermission({
       title={toolCall.title ?? "Execute command"}
       pendingAction={
         command ? (
-          <Box className="max-h-[30vh] overflow-auto">
-            <Code
-              variant="ghost"
-              title={command}
-              className="whitespace-pre-wrap break-all text-[13px]"
-            >
-              {compactHomePath(command)}
-            </Code>
-          </Box>
+          <Code
+            variant="ghost"
+            title={command}
+            className="whitespace-pre-wrap break-all text-[13px]"
+          >
+            {compactHomePath(command)}
+          </Code>
         ) : undefined
       }
       question="Do you want to proceed?"
diff --git a/apps/code/src/renderer/components/permissions/McpPermission.tsx b/apps/code/src/renderer/components/permissions/McpPermission.tsx
index 375926665..100856123 100644
--- a/apps/code/src/renderer/components/permissions/McpPermission.tsx
+++ b/apps/code/src/renderer/components/permissions/McpPermission.tsx
@@ -6,7 +6,7 @@ import {
   isPostHogExecTool,
 } from "@features/posthog-mcp/utils/posthog-exec-display";
 import { formatInput } from "@features/sessions/components/session-update/toolCallUtils";
-import { Box, Code } from "@radix-ui/themes";
+import { Code } from "@radix-ui/themes";
 import { DefaultPermission } from "./DefaultPermission";
 import { type BasePermissionProps, toSelectorOptions } from "./types";
 
@@ -54,14 +54,12 @@ export function McpPermission({
       }
       pendingAction={
         fullInput ? (
-          <Box className="max-h-[30vh] overflow-auto">
-            <Code
-              variant="ghost"
-              className="whitespace-pre-wrap break-all text-[13px]"
-            >
-              {fullInput}
-            </Code>
-          </Box>
+          <Code
+            variant="ghost"
+            className="whitespace-pre-wrap break-all text-[13px]"
+          >
+            {fullInput}
+          </Code>
         ) : undefined
       }
       question="Do you want to proceed?"
diff --git a/apps/code/src/renderer/features/sessions/components/SessionView.tsx b/apps/code/src/renderer/features/sessions/components/SessionView.tsx
index b95675e7d..eb74c619d 100644
--- a/apps/code/src/renderer/features/sessions/components/SessionView.tsx
+++ b/apps/code/src/renderer/features/sessions/components/SessionView.tsx
@@ -581,7 +581,7 @@ export function SessionView({
                     </Flex>
                   </Flex>
                 ) : hideInput ? null : firstPendingPermission ? (
-                  <Box className="max-h-1/2 min-h-0 overflow-y-auto border-gray-4 border-t">
+                  <Box className="border-gray-4 border-t">
                     <Box
                       className={compact ? "p-1" : "mx-auto p-2"}
                       style={