diff --git a/ui/src/components/setup/wizard/steps/account-step.tsx b/ui/src/components/setup/wizard/steps/account-step.tsx
index 3914db7e..0d9da4c6 100644
--- a/ui/src/components/setup/wizard/steps/account-step.tsx
+++ b/ui/src/components/setup/wizard/steps/account-step.tsx
@@ -22,7 +22,8 @@ export function AccountStep({
         Select an account ({accounts.length})
       </div>
 
-      <div className="grid gap-2">
+      {/* Scrollable account list with max-height for many accounts */}
+      <div className="grid gap-2 max-h-[320px] overflow-y-auto pr-1">
         {accounts.map((acc) => (
           <button
             key={acc.id}