diff --git a/client/components/ArmSwitcherModal.tsx b/client/components/ArmSwitcherModal.tsx
index 4d4cf571..5ef1f8d9 100644
--- a/client/components/ArmSwitcherModal.tsx
+++ b/client/components/ArmSwitcherModal.tsx
@@ -135,7 +135,7 @@ export default function ArmSwitcherModal({
   return (
     <div className="fixed inset-0 z-[999] bg-black/98 backdrop-blur-lg overflow-hidden flex flex-col">
       {/* Header */}
-      <div className="flex items-center justify-between px-4 sm:px-6 py-2 border-b border-gray-800/50">
+      <div className="flex items-center justify-between px-4 sm:px-6 py-2 border-b border-gray-800/50 flex-shrink-0">
         <button
           type="button"
           onClick={handleBack}
@@ -151,7 +151,7 @@ export default function ArmSwitcherModal({
       </div>
 
       {/* Content */}
-      <div className="flex-1 overflow-y-auto px-4 sm:px-6 py-4 sm:py-3 flex items-start justify-center">
+      <div className="flex-1 overflow-y-auto px-4 sm:px-6 py-8 sm:py-6 flex items-center justify-center flex-shrink-0 min-h-0">
         {!selectedArm ? (
           // Arm Grid - Minimal
           <div className="w-full max-w-sm space-y-1">