diff --git a/forge-gui/src/main/java/forge/match/input/InputAttack.java b/forge-gui/src/main/java/forge/match/input/InputAttack.java
index 5f485ece428..b2b0b5ad40e 100644
--- a/forge-gui/src/main/java/forge/match/input/InputAttack.java
+++ b/forge-gui/src/main/java/forge/match/input/InputAttack.java
@@ -246,6 +246,7 @@ public class InputAttack extends InputSyncronizedBase {
 
     private boolean canUndeclareAttacker(Card card) {
         return !card.hasKeyword("CARDNAME attacks each turn if able.") &&
+               !card.hasKeyword("CARDNAME attacks each combat if able.") &&
                !card.hasStartOfKeyword("CARDNAME attacks specific player each combat if able") &&
                card.getController().getMustAttackEntity() == null;
     }
@@ -313,6 +314,6 @@ public class InputAttack extends InputSyncronizedBase {
         showMessage(message);
 
         updatePrompt();
-        MatchUtil.getController().showCombat(getController().getCombat()); // redraw sword icons
+        MatchUtil.getController().showCombat(getController().getCombat()); // redraw sword icons
     }
 }