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 d5b103a2d8..7ffa2e9a3c 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -1822,6 +1822,10 @@ 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() {
@@ -1902,9 +1906,6 @@ public final class GamePanel extends javax.swing.JPanel {
             }
         });
 
-        // special hotkeys for custom rendered dialogs without focus
-        this.abilityPicker.injectHotkeys(this, "ABILITY_PICKER");
-
         final BasicSplitPaneUI myUi = (BasicSplitPaneUI) jSplitPane0.getUI();
         final BasicSplitPaneDivider divider = myUi.getDivider();
         final JButton upArrowButton = (JButton) divider.getComponent(0);