diff --git a/forge-gui/src/main/java/forge/match/input/InputSelectManyBase.java b/forge-gui/src/main/java/forge/match/input/InputSelectManyBase.java
index da2b1dedd22..035aebe3bf2 100644
--- a/forge-gui/src/main/java/forge/match/input/InputSelectManyBase.java
+++ b/forge-gui/src/main/java/forge/match/input/InputSelectManyBase.java
@@ -48,6 +48,7 @@ public abstract class InputSelectManyBase<T extends GameEntity> extends InputSyn
         boolean canCancel = allowCancel;
         boolean canOk = hasEnoughTargets();
 
+        ButtonUtil.reset();
         if (canOk && canCancel) { ButtonUtil.enableAllFocusOk(); }
         if (!canOk && canCancel) { ButtonUtil.enableOnlyCancel(); }
         if (canOk && !canCancel) { ButtonUtil.enableOnlyOk(); }
diff --git a/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java b/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java
index 41356271648..a0d8a5e8fa1 100644
--- a/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java
+++ b/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java
@@ -74,6 +74,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
         showMessage(sb.toString());
 
         // If reached Minimum targets, enable OK button
+        ButtonUtil.reset();
         if (!tgt.isMinTargetsChosen(sa.getHostCard(), sa) || tgt.isDividedAsYouChoose()) {
             if (mandatory && tgt.hasCandidates(sa, true)) {
                 // Player has to click on a target