diff --git a/client/src/pages/Student/JoinRoom/JoinRoom.tsx b/client/src/pages/Student/JoinRoom/JoinRoom.tsx
index f0ac8d7..c458d61 100644
--- a/client/src/pages/Student/JoinRoom/JoinRoom.tsx
+++ b/client/src/pages/Student/JoinRoom/JoinRoom.tsx
@@ -111,6 +111,12 @@ const JoinRoom: React.FC = () => {
         webSocketService.submitAnswer(answerData);
     };
 
+    const handleReturnKey = (e: React.KeyboardEvent<HTMLInputElement>) => {
+        if (e.key === 'Enter' && username && roomName) {
+            handleSocket();
+        }
+    };
+
     if (isWaitingForTeacher) {
         return (
             <div className='room'>
@@ -167,7 +173,8 @@ const JoinRoom: React.FC = () => {
                         onChange={(e) => setRoomName(e.target.value)}
                         placeholder="Numéro de la salle"
                         sx={{ marginBottom: '1rem' }}
-                        fullWidth
+                        fullWidth={true}
+                        onKeyDown={handleReturnKey}
                     />
 
                     <TextField
@@ -177,7 +184,8 @@ const JoinRoom: React.FC = () => {
                         onChange={(e) => setUsername(e.target.value)}
                         placeholder="Nom d'utilisateur"
                         sx={{ marginBottom: '1rem' }}
-                        fullWidth
+                        fullWidth={true}
+                        onKeyDown={handleReturnKey}
                     />
 
                     <LoadingButton
diff --git a/client/src/pages/Teacher/Login/Login.tsx b/client/src/pages/Teacher/Login/Login.tsx
index 7c82a24..f305101 100644
--- a/client/src/pages/Teacher/Login/Login.tsx
+++ b/client/src/pages/Teacher/Login/Login.tsx
@@ -1,6 +1,4 @@
-import { useNavigate, Link } from 'react-router-dom';
-
-// JoinRoom.tsx
+import { Link, useNavigate } from 'react-router-dom';
 import React, { useEffect, useState } from 'react';
 
 import './Login.css';
@@ -38,6 +36,11 @@ const Login: React.FC = () => {
 
     };
 
+    const handleReturnKey = (e: React.KeyboardEvent<HTMLInputElement>) => {
+        if (e.key === 'Enter' && email && password) {
+            login();
+        }
+    };
 
     return (
         <LoginContainer
@@ -51,7 +54,8 @@ const Login: React.FC = () => {
                 onChange={(e) => setEmail(e.target.value)}
                 placeholder="Adresse courriel"
                 sx={{ marginBottom: '1rem' }}
-                fullWidth
+                fullWidth={true}
+                onKeyDown={handleReturnKey} // Add this line as well
             />
 
             <TextField
@@ -62,7 +66,8 @@ const Login: React.FC = () => {
                 onChange={(e) => setPassword(e.target.value)}
                 placeholder="Mot de passe"
                 sx={{ marginBottom: '1rem' }}
-                fullWidth
+                fullWidth={true}
+                onKeyDown={handleReturnKey} // Add this line as well
             />
 
             <LoadingButton