diff --git a/packages/libeufin-bank-webui/src/pages/SolveMFA.tsx b/packages/libeufin-bank-webui/src/pages/SolveMFA.tsx
index b54f6a43d..4fcd390e6 100644
--- a/packages/libeufin-bank-webui/src/pages/SolveMFA.tsx
+++ b/packages/libeufin-bank-webui/src/pages/SolveMFA.tsx
@@ -478,6 +478,10 @@ function SolveMFAChallenges({
   const hasSolvedEnough = currentChallenge.combi_and
     ? currentSolved.length === currentChallenge.challenges.length
     : currentSolved.length > 0;
+  // The dialog opens while keyboard focus is still on the button that
+  // started the operation, behind the overlay, where Enter would submit it
+  // again.  Move focus to the first challenge that still has to be done.
+  let focusPending = !!focus;
 
   return (
     <Fragment>
@@ -543,6 +547,8 @@ function SolveMFAChallenges({
                 solved.indexOf(challenge.challenge_id) !== -1 ||
                 (currentChallenge.combi_and &&
                   nextAndChallenge?.challenge_id !== challenge.challenge_id);
+              const focusHere = focusPending && !noNeedToComplete;
+              if (focusHere) focusPending = false;
 
               return (
                 <div
@@ -576,15 +582,21 @@ function SolveMFAChallenges({
                             name="cancel"
                             class="text-sm font-semibold leading-6 text-onBackground"
                             disabled={noNeedToComplete}
+                            focus={focusHere && alreadySent}
                             onClick={() => selectChallenge.run(challenge)}
                           >
                             <i18n.Translate>I have a code</i18n.Translate>
                           </AsyncButton>
 
+                          {/* Not tied to alreadySent: focusing the disabled
+                              button does nothing, while a ref that changes
+                              when the retransmission wait ends would steal
+                              focus later. */}
                           <AsyncButton
                             submit
                             name="send again"
                             class="disabled:opacity-50 disabled:cursor-default cursor-pointer rounded-md bg-primary px-3 py-2 text-sm font-semibold text-onPrimary shadow-sm hover:bg-primaryHover hover:text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary"
+                            focus={focusHere}
                             disabled={alreadySent || noNeedToComplete}
                             onClick={() => sendMessage.run(challenge)}
                           >