diff --git a/apps/code/src/renderer/features/command-center/components/CommandCenterToolbar.tsx b/apps/code/src/renderer/features/command-center/components/CommandCenterToolbar.tsx
index d4b5651e8..a6bd878d1 100644
--- a/apps/code/src/renderer/features/command-center/components/CommandCenterToolbar.tsx
+++ b/apps/code/src/renderer/features/command-center/components/CommandCenterToolbar.tsx
@@ -123,7 +123,7 @@ export function CommandCenterToolbar({
         onValueChange={(v) => setLayout(v as LayoutPreset)}
       >
         <Select.Trigger variant="ghost" className="text-[12px]" />
-        <Select.Content>
+        <Select.Content position="popper">
           {LAYOUT_OPTIONS.map((opt) => (
             <Select.Item key={opt.value} value={opt.value}>
               <Flex align="center" gap="2">
diff --git a/apps/code/src/renderer/features/sessions/components/SessionView.tsx b/apps/code/src/renderer/features/sessions/components/SessionView.tsx
index def15befe..456f3b277 100644
--- a/apps/code/src/renderer/features/sessions/components/SessionView.tsx
+++ b/apps/code/src/renderer/features/sessions/components/SessionView.tsx
@@ -563,10 +563,14 @@ export function SessionView({
                     </Flex>
                   </Flex>
                 ) : hideInput ? null : firstPendingPermission ? (
-                  <Box className="border-gray-4 border-t">
+                  <Box className="max-h-1/2 min-h-0 overflow-y-auto border-gray-4 border-t">
                     <Box
-                      className="mx-auto p-2"
-                      style={{ maxWidth: CHAT_CONTENT_MAX_WIDTH }}
+                      className={compact ? "p-1" : "mx-auto p-2"}
+                      style={
+                        compact
+                          ? undefined
+                          : { maxWidth: CHAT_CONTENT_MAX_WIDTH }
+                      }
                     >
                       <PermissionSelector
                         toolCall={firstPendingPermission.toolCall}