diff --git a/client/src/__tests__/pages/ManageRoom/ManageRoom.test.tsx b/client/src/__tests__/pages/ManageRoom/ManageRoom.test.tsx
index 2d0259e..a0645eb 100644
--- a/client/src/__tests__/pages/ManageRoom/ManageRoom.test.tsx
+++ b/client/src/__tests__/pages/ManageRoom/ManageRoom.test.tsx
@@ -344,11 +344,10 @@ describe('ManageRoom', () => {
         const tableHeader = screen.getByText('Q1');
         fireEvent.click(tableHeader);
 
-        const closeButton = screen.getByRole('button', { name: /✖/i });
-        expect(closeButton).toBeInTheDocument();
+        const questionVisibilitySwitch = screen.getByTestId('question-visibility-switch'); // Get the specific switch
         expect(screen.getByText(/Question 1\//i)).toBeInTheDocument();
 
-        fireEvent.click(closeButton);
+        fireEvent.click(questionVisibilitySwitch);
 
         expect(screen.queryByRole('button', { name: /✖/i })).not.toBeInTheDocument();
         expect(screen.queryByText(/Question 1\//i)).not.toBeInTheDocument();
diff --git a/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx b/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx
index 7034bdc..60153e4 100644
--- a/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx
+++ b/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx
@@ -318,6 +318,7 @@ const ManageRoom: React.FC = () => {
             return;
         }
         setQuizQuestions(quizQuestions);
+        setCurrentQuestion(quizQuestions[0]);
         webSocketService.launchStudentModeQuiz(formattedRoomName, quizQuestions);
     };
 
@@ -475,19 +476,20 @@ const ManageRoom: React.FC = () => {
                     <div style={{ display: 'flex', flexDirection: 'column' }}>
                         <div className="title center-h-align mb-2">{quiz?.title}</div>
                         
-                            <div className='close-button-wrapper'>
+                    <div className='close-button-wrapper'>
                     <FormControlLabel
                         label={<div className="text-sm">Afficher les questions</div>}
                         control={
                             <Switch
-                                value={isQuestionShown}
+                                data-testid="question-visibility-switch" // Add a unique test ID
+                                checked={isQuestionShown}
                                 onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
                                     setIsQuestionShown(e.target.checked)
                                 }
                             />
                         }
                     />
-                            </div>
+                    </div>
                     
                         {!isNaN(Number(currentQuestion?.question.id))
                             && isQuestionShown && (
diff --git a/client/src/pages/Teacher/ManageRoom/manageRoom.css b/client/src/pages/Teacher/ManageRoom/manageRoom.css
index 9246099..bd4b6fb 100644
--- a/client/src/pages/Teacher/ManageRoom/manageRoom.css
+++ b/client/src/pages/Teacher/ManageRoom/manageRoom.css
@@ -39,7 +39,7 @@
 
 .close-button-wrapper{
     display: flex;
-    justify-content: flex-end;
+    justify-content: flex-start;
     margin-right: 1rem;
 }