diff --git a/src/main/java/forge/game/phase/CombatUtil.java b/src/main/java/forge/game/phase/CombatUtil.java
index 4cb0f142ba8..254a772bcba 100644
--- a/src/main/java/forge/game/phase/CombatUtil.java
+++ b/src/main/java/forge/game/phase/CombatUtil.java
@@ -61,6 +61,7 @@ import forge.game.player.Player;
 import forge.game.zone.PlayerZone;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
+import forge.gui.GuiUtils;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.SDisplayUtil;
 import forge.gui.match.views.VCombat;
@@ -437,6 +438,7 @@ public class CombatUtil {
 
             List<Card> orderedBlockers = null;
             if (player.isHuman()) {
+                GuiUtils.setPanelSelection(attacker);
                 List<Card> ordered = GuiChoose.getOrderChoices("Choose Blocking Order", "Damaged First", 0, blockers, null, attacker);
 
                 orderedBlockers = new ArrayList<Card>();
diff --git a/src/main/java/forge/gui/match/TargetingOverlay.java b/src/main/java/forge/gui/match/TargetingOverlay.java
index a36871d38fe..e5f2d40e9c1 100644
--- a/src/main/java/forge/gui/match/TargetingOverlay.java
+++ b/src/main/java/forge/gui/match/TargetingOverlay.java
@@ -89,11 +89,11 @@ public enum TargetingOverlay {
                 activePanel = null;
                 for (CField f : CMatchUI.SINGLETON_INSTANCE.getFieldControls()) {
                     cardPanels.addAll(f.getView().getTabletop().getCardPanels());
-                }
-                for (VField f : fields) {
-                    if (f.getTabletop().getCardFromMouseOverPanel() != null) {
-                        activePanel = f.getTabletop().getMouseOverPanel();
-                        break;
+                    List<CardPanel> cPanel = f.getView().getTabletop().getCardPanels();
+                    for (CardPanel c : cPanel) {
+                        if (c.isSelected()) {
+                            activePanel = c;
+                        }
                     }
                 }
                 break;
diff --git a/src/main/java/forge/view/arcane/CardPanel.java b/src/main/java/forge/view/arcane/CardPanel.java
index a8ad5636a3c..716a6540ffb 100644
--- a/src/main/java/forge/view/arcane/CardPanel.java
+++ b/src/main/java/forge/view/arcane/CardPanel.java
@@ -279,6 +279,17 @@ public class CardPanel extends JPanel implements CardContainer {
         this.repaint();
     }
 
+    /**
+     * <p>
+     * isSelected.
+     * </p>
+     * 
+     * @return a boolean.
+     */
+    public final boolean isSelected() {
+        return this.isSelected;
+    }
+
     /**
      * <p>
      * Setter for the field <code>showCastingCost</code>.