diff --git a/app/assets/javascripts/views/challenge_modal/challenge_modal.tsx b/app/assets/javascripts/views/challenge_modal/challenge_modal.tsx
index 555696cd3..6530d7d71 100644
--- a/app/assets/javascripts/views/challenge_modal/challenge_modal.tsx
+++ b/app/assets/javascripts/views/challenge_modal/challenge_modal.tsx
@@ -374,7 +374,10 @@ function ChallengePrompts({
         </div>
       ) : (
         <div key={prompt.id} className="sk-panel-row">
-          <form className="w-full">
+          <form className="w-full" onSubmit={(event) => {
+            event.preventDefault();
+            ctrl.submit();
+          }}>
             <input
               className="sk-input contrast"
               value={ctrl.state.values[prompt.id]!.value as string | number}
@@ -383,12 +386,6 @@ function ChallengePrompts({
                 ctrl.state.values[prompt.id]!.value = value;
                 ctrl.onTextValueChange(prompt);
               }}
-              onKeyUp={(event) => {
-                if (event.key === 'Enter') {
-                  event.preventDefault();
-                  ctrl.submit();
-                }
-              }}
               ref={index === 0 ? initialFocusRef : undefined}
               placeholder={prompt.title}
               type={prompt.secureTextEntry ? 'password' : 'text'}