diff --git a/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java
index 216e4fc98ac..e4d24ef1bb4 100644
--- a/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java
+++ b/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java
@@ -491,8 +491,8 @@ public class PlayerControllerHuman extends PlayerController {
     @Override
     public List<Card> chooseCardsToDiscardFrom(Player p, SpellAbility sa, List<Card> valid, int min, int max) {
         if (p != player) {
-            int cntToKeepInHand =  min == 0 ? -1 : valid.size() - min;
-            return GuiChoose.order("Choose cards to Discard", "Discarded", cntToKeepInHand, valid, null, null);
+            return GuiChoose.order("Choose " + min + " card" + (min != 1 ? "s" : "") + " to discard",
+                    "Discarded", valid.size() - min, valid, null, null);
         }
 
         InputSelectCards inp = new InputSelectCardsFromList(min, max, valid);
diff --git a/forge-gui/src/main/java/forge/gui/DualListBox.java b/forge-gui/src/main/java/forge/gui/DualListBox.java
index 771c4752678..dce3af9c19f 100644
--- a/forge-gui/src/main/java/forge/gui/DualListBox.java
+++ b/forge-gui/src/main/java/forge/gui/DualListBox.java
@@ -84,6 +84,8 @@ public class DualListBox<T> extends FPanel {
             @SuppressWarnings("unchecked")
             @Override
             public void run() {
+                if (!addButton.isEnabled()) { return; }
+
                 List<T> selected = new ArrayList<T>();
                 for (Object item : sourceList.getSelectedValuesList()) {
                     selected.add((T)item);
@@ -99,6 +101,8 @@ public class DualListBox<T> extends FPanel {
             @SuppressWarnings("unchecked")
             @Override
             public void run() {
+                if (!removeButton.isEnabled()) { return; }
+
                 List<T> selected = new ArrayList<T>();
                 for (Object item : destList.getSelectedValuesList()) {
                     selected.add((T)item);