diff --git a/ProjetJava/src/main/java/views/CalculPanel.java b/ProjetJava/src/main/java/views/CalculPanel.java
index c28e02142baf4cdc8cd0a5e81a3bae0a3856508d..42b1f059683883b1a9a5bfa5e86965b9b8705b74 100644
--- a/ProjetJava/src/main/java/views/CalculPanel.java
+++ b/ProjetJava/src/main/java/views/CalculPanel.java
@@ -32,7 +32,7 @@ public class CalculPanel extends JPanel {
     private CalculService cs = new CalculService();
     private Calcul calcul;
     private GameLevel gameLevel;
-
+    private JTextField textResponse;
 
     Color lightGreen = new Color(180, 230, 180);
     Color lightRed = new Color(245, 190, 190);
@@ -58,7 +58,7 @@ public class CalculPanel extends JPanel {
         JPanel panelResponse = new JPanel(new FlowLayout(FlowLayout.CENTER));
         JLabel labelReponse = new JLabel("Votre réponse : ");
         labelReponse.setFont(new Font("Arial", Font.PLAIN, 16));
-        JTextField textResponse = new JTextField(20);
+        textResponse = new JTextField(20);
         textResponse.setFont(new Font("Arial", Font.PLAIN, 16));
 
         panelResponse.add(labelReponse);
@@ -116,9 +116,11 @@ public class CalculPanel extends JPanel {
 
                 // Remet les réponses à 0
                 clearResponse(textResponse, labelVerif);
+                textResponse.requestFocusInWindow();
             }
         });
 
+        
         panelSud.add(btnCheck);
         panelSud.add(btnSolution);
         panelSud.add(btnNewCalcul);
@@ -162,4 +164,8 @@ public class CalculPanel extends JPanel {
         t.setBackground(Color.WHITE);
         t.setBorder(null);
     }
+    
+    public JTextField getChampCalcul(){
+        return textResponse;
+    }
 }
diff --git a/ProjetJava/src/main/java/views/PrimaryWindow.java b/ProjetJava/src/main/java/views/PrimaryWindow.java
index fe9d4fa1582d94a7a571240d28e7cee0c4ed776f..2e927bf2ccf8caeea80c0529923d8c2bc4cb293b 100644
--- a/ProjetJava/src/main/java/views/PrimaryWindow.java
+++ b/ProjetJava/src/main/java/views/PrimaryWindow.java
@@ -121,6 +121,18 @@ public class PrimaryWindow extends JFrame {
         tabbedPane.addTab("Calcul", p);
         tabbedPane.addTab("Question", panelQuestion);
 
+        
+        // Gestion du focus des champs de texte
+        tabbedPane.addChangeListener(e -> {
+            if(tabbedPane.getSelectedIndex() == 1){
+                p.getChampCalcul().requestFocus();
+            }
+            
+            if(tabbedPane.getSelectedIndex() == 2){
+                panelQuestion.getChampQuestion().requestFocus();
+            }
+        });
+        
         // Admin
         /* 
          * Onglet Administration (quatrième onglet)
diff --git a/ProjetJava/src/main/java/views/QuestionPanel.java b/ProjetJava/src/main/java/views/QuestionPanel.java
index 243470d870eee3ea35ba709ee0f7342efa46db2c..9e088c8ae4da5b7bc272633423df8271e900e752 100644
--- a/ProjetJava/src/main/java/views/QuestionPanel.java
+++ b/ProjetJava/src/main/java/views/QuestionPanel.java
@@ -155,4 +155,7 @@ public final class QuestionPanel extends JPanel {
         labelValidator.setText("");
     }
 
+    public JTextField getChampQuestion(){
+        return textResponse;
+    }
 }