diff --git a/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx b/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx index e422a3dfb..f1f6a547f 100644 --- a/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx +++ b/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx @@ -49,9 +49,15 @@ const ChallengeModalPrompt: FunctionComponent = ({ } biometricsButtonRef.current?.click() - } else { - inputRef.current?.focus() + return } + + const parentForm = inputRef.current?.closest('form') + if (parentForm?.contains(document.activeElement)) { + return + } + + inputRef.current?.focus() }, [application, prompt.id, prompt.validation, values]) useEffect(() => {