diff --git a/frontend/src/pages/riddle/riddle.page.tsx b/frontend/src/pages/riddle/riddle.page.tsx
index 7ed4e0981..03c43683a 100644
--- a/frontend/src/pages/riddle/riddle.page.tsx
+++ b/frontend/src/pages/riddle/riddle.page.tsx
@@ -78,6 +78,7 @@ const RiddlePage = () => {
                 duration: 5000,
                 isClosable: true
               }) || null
+            solutionInput.current?.focus()
           }
           if (result.status === RiddleSubmissionStatus.SUBMITTER_BANNED) {
             if (toastIdRef.current) {