diff --git a/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java b/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
index 4c0db390c91..f554a960ad3 100644
--- a/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
@@ -169,6 +169,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
         }
         if (requestFocusAllowed) {
             this.btnRight.requestFocus();
+            this.helper.requestFocus();
         }
     }
 
diff --git a/Mage.Client/src/main/java/mage/client/game/HelperPanel.java b/Mage.Client/src/main/java/mage/client/game/HelperPanel.java
index feea4e7d4b6..e8aca996c73 100644
--- a/Mage.Client/src/main/java/mage/client/game/HelperPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/HelperPanel.java
@@ -103,6 +103,7 @@ public class HelperPanel extends JPanel {
 
         btnEndTurn = new JButton("End Turn");
         btnEndTurn.setToolTipText("End The Turn");
+        btnEndTurn.setFocusable(false);
         container.add(btnEndTurn);
 
         btnLeft.addActionListener(new java.awt.event.ActionListener() {
@@ -184,4 +185,8 @@ public class HelperPanel extends JPanel {
             btnEndTurn.setVisible(false);
         }
     }
+
+    public void requestFocus() {
+        this.btnRight.requestFocus();
+    }
 }