diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
index 7ffa2e9a3c..7078b93a2b 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -1650,8 +1650,14 @@ public final class GamePanel extends javax.swing.JPanel {
 
         bigCard.setBorder(new LineBorder(Color.black, 1, true));
 
+        // HOTKEYS
+
         int c = JComponent.WHEN_IN_FOCUSED_WINDOW;
 
+        // special hotkeys for custom rendered dialogs without focus
+        // call it before any user defined hotkeys
+        this.abilityPicker.injectHotkeys(this, "ABILITY_PICKER");
+
         btnToggleMacro.setContentAreaFilled(false);
         btnToggleMacro.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
         btnToggleMacro.setIcon(new ImageIcon(ImageManagerImpl.instance.getToggleRecordMacroButtonImage()));
@@ -1822,10 +1828,6 @@ public final class GamePanel extends javax.swing.JPanel {
 
         // HOTKEYS
 
-        // special hotkeys for custom rendered dialogs without focus
-        // call it before any user defined hotkeys
-        this.abilityPicker.injectHotkeys(this, "ABILITY_PICKER");
-
         KeyStroke ks2 = getCachedKeystroke(KEY_CONTROL_CONFIRM);
         this.getInputMap(c).put(ks2, "F2_PRESS");
         this.getActionMap().put("F2_PRESS", new AbstractAction() {