diff --git a/src/components/quiz-question/multi-choice/multi-choice.tsx b/src/components/quiz-question/multi-choice/multi-choice.tsx
index e6898b2..3d9918f 100644
--- a/src/components/quiz-question/multi-choice/multi-choice.tsx
+++ b/src/components/quiz-question/multi-choice/multi-choice.tsx
@@ -35,12 +35,11 @@ export const MultiChoice = withText(translates)(
   }: QuestionProps & MultiChoiceProps & QuizTranslates) => {
     const selectedArray = selected ? selected.split(',') : [];
     const disabled = !onSelect;
-    const quizQuestionRef = useRef<HTMLLegendElement>(null);
     let answersOptionsRefMap: Map<number, HTMLElement | null> = new Map();
 
     useEffect(() => {
       if (!disabled) {
-        quizQuestionRef.current?.focus();
+        answersOptionsRefMap.get(0)?.focus();
       }
     }, [question]);
 
@@ -83,7 +82,7 @@ export const MultiChoice = withText(translates)(
 
     return (
       <div className={styles.multiChoiceWrapper} data-testid="multipleChoiceContainer">
-        <legend className={styles.questionText} data-testid="multipleChoiceQuestionTitle" ref={quizQuestionRef}>
+        <legend className={styles.questionText} data-testid="multipleChoiceQuestionTitle">
           <span className={styles.visuallyHidden}>{`${otherProps.questionLabel} #${questionIndex}:`}</span>
           <div dangerouslySetInnerHTML={{ __html: wrapLinksWithTags(question) }} />
         </legend>
diff --git a/src/components/quiz-question/open-question/open-question.tsx b/src/components/quiz-question/open-question/open-question.tsx
index 75741aa..6ec0ab4 100644
--- a/src/components/quiz-question/open-question/open-question.tsx
+++ b/src/components/quiz-question/open-question/open-question.tsx
@@ -19,6 +19,7 @@ const translates = (): QuizTranslates => {
 export const OpenQuestion = withText(translates)(
   ({question, selected, onSelect, hint, questionIndex, ...otherProps}: QuestionProps & QuizTranslates) => {
     const disabled = !onSelect;
+      const textareaRef = useRef<HTMLTextAreaElement>(null);
 
     const handleChange = useCallback(
       (e: any) => {
@@ -27,16 +28,15 @@ export const OpenQuestion = withText(translates)(
       [onSelect]
     );
 
-    const quizQuestionRef = useRef<HTMLLegendElement>(null);
     useEffect(() => {
       if (!disabled) {
-        quizQuestionRef.current?.focus();
+        textareaRef.current?.focus();
       }
     }, [question]);
 
     return (
       <div className={styles.openQuestionWrapper} data-testid="openQuestionContainer">
-        <legend className={styles.questionText} data-testid="openQuestionTitle" ref={quizQuestionRef}>
+        <legend className={styles.questionText} data-testid="openQuestionTitle">
           <span className={styles.visuallyHidden}>{`${otherProps.questionLabel} #${questionIndex}:`}</span>
           <div dangerouslySetInnerHTML={{__html: wrapLinksWithTags(question)}} />
         </legend>
@@ -52,6 +52,7 @@ export const OpenQuestion = withText(translates)(
             onChange={handleChange}
             disabled={disabled}
             data-testid="openQuestionAnswerInput"
+            ref={textareaRef}
           />
           <div className={styles.charCounter}>{`${selected.length}/${MAX_LENGTH}`}</div>
         </div>
diff --git a/src/components/quiz-question/quiz-question-wrapper.tsx b/src/components/quiz-question/quiz-question-wrapper.tsx
index ea8aad3..298d9d2 100644
--- a/src/components/quiz-question/quiz-question-wrapper.tsx
+++ b/src/components/quiz-question/quiz-question-wrapper.tsx
@@ -63,17 +63,18 @@ export const QuizQuestionWrapper = withText(translates)((props: QuizQuestionWrap
       if (!playerNav) {
         return;
       }
-      if (qui.a) {
-        continueButtonRef.current?.focus();
-      }
     });
   }, [qui]);
 
   useEffect(() => {
     setSelected(getSelected(qui));
     setIsLoading(false);
+    if(qui.a || qui.q.questionType === KalturaQuizQuestionTypes.Reflection){
+      continueButtonRef.current?.focus();
+    }
   }, [qui]);
 
+
   const handleContinue = useCallback(() => {
     if (!selected) {
       return;
@@ -134,7 +135,7 @@ export const QuizQuestionWrapper = withText(translates)((props: QuizQuestionWrap
       case KalturaQuizQuestionTypes.MultiChoice:
         return <MultiChoice {...questionProps} />;
       case KalturaQuizQuestionTypes.Reflection:
-        return <ReflectionPoint {...questionProps} />;
+        return <ReflectionPoint {...questionProps}/>;
       case KalturaQuizQuestionTypes.OpenQuestion:
         return <OpenQuestion {...questionProps} />;
       case KalturaQuizQuestionTypes.MultiAnswer:
diff --git a/src/components/quiz-question/reflection-point/reflection-point.tsx b/src/components/quiz-question/reflection-point/reflection-point.tsx
index 87ccc8c..aa5286a 100644
--- a/src/components/quiz-question/reflection-point/reflection-point.tsx
+++ b/src/components/quiz-question/reflection-point/reflection-point.tsx
@@ -14,14 +14,10 @@ const translates = (): QuizTranslates => {
 };
 
 export const ReflectionPoint = withText(translates)(({question, questionIndex, ...otherProps}: QuestionProps & QuizTranslates) => {
-  const quizQuestionRef = useRef<HTMLLegendElement>(null);
-  useEffect(() => {
-    quizQuestionRef.current?.focus();
-  }, [question]);
 
   return (
     <div className={styles.reflectionPointWrapper}>
-      <legend className={styles.reflectionText} data-testid="reflectionPointTitle" ref={quizQuestionRef}>
+      <legend className={styles.reflectionText} data-testid="reflectionPointTitle">
         <span className={styles.visuallyHidden}>{`${otherProps.questionLabel}# ${questionIndex}, ${otherProps.reflectionPoint}:`}</span>
         <div dangerouslySetInnerHTML={{ __html: wrapLinksWithTags(question) }} />
       </legend>
diff --git a/src/components/quiz-question/true-false/true-false.tsx b/src/components/quiz-question/true-false/true-false.tsx
index ebf0697..776ee5f 100644
--- a/src/components/quiz-question/true-false/true-false.tsx
+++ b/src/components/quiz-question/true-false/true-false.tsx
@@ -24,10 +24,9 @@ export const TrueFalse = withText(translates)(
       },
       [onSelect]
     );
-    const quizQuestionRef = useRef<HTMLLegendElement>(null);
     useEffect(() => {
       if (!disabled) {
-        quizQuestionRef.current?.focus();
+        answersOptionsRefMap.get(0)?.focus();
       }
     }, [question]);
 
@@ -56,7 +55,7 @@ export const TrueFalse = withText(translates)(
 
     return (
       <div className={styles.trueFalseWrapper} data-testid="trueFalseContainer">
-        <legend className={styles.questionText} data-testid="trueFalseQuestionTitle" ref={quizQuestionRef}>
+        <legend className={styles.questionText} data-testid="trueFalseQuestionTitle">
           <span className={styles.visuallyHidden}>{`${otherProps.questionLabel} #${questionIndex}:`}</span>
           <div dangerouslySetInnerHTML={{ __html: wrapLinksWithTags(question) }} />
         </legend>