diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java
index 5359176f7e8..4264da93a19 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java
@@ -17,16 +17,9 @@
  */
 package forge.screens.deckeditor.controllers;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map.Entry;
-
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.base.Supplier;
-
 import com.google.common.collect.Iterables;
 import forge.card.CardDb;
 import forge.card.CardRules;
@@ -50,6 +43,12 @@ import forge.screens.match.controllers.CDetailPicture;
 import forge.toolbox.FComboBox;
 import forge.util.ItemPool;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+
 /**
  * Child controller for constructed deck editor UI.
  * This is the least restrictive mode;
@@ -106,7 +105,8 @@ public final class CEditorCommander extends CDeckEditor<Deck> {
         }
 
         CardManager catalogManager = new CardManager(getCDetailPicture(), true, false);
-        CardManager deckManager = new CardManager(getCDetailPicture(), true, false);
+        CardManager deckManager = new CardManager(getCDetailPicture(), false, false);
+        deckManager.setAlwaysNonUnique(true);
 
         catalogManager.setCaption("Catalog");
 
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java
index ff262bc676d..ff09085ef0f 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java
@@ -17,14 +17,7 @@
  */
 package forge.screens.deckeditor.controllers;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map.Entry;
-
 import com.google.common.base.Supplier;
-
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckSection;
@@ -43,6 +36,12 @@ import forge.toolbox.FComboBox;
 import forge.util.ItemPool;
 import forge.util.Localizer;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+
 /**
  * Child controller for constructed deck editor UI.
  * This is the least restrictive mode;
@@ -130,7 +129,8 @@ public final class CEditorConstructed extends CDeckEditor<Deck> {
         }
 
         catalogManager = new CardManager(getCDetailPicture(), wantUnique, false);
-        deckManager = new CardManager(getCDetailPicture(), wantUnique, false);
+        deckManager = new CardManager(getCDetailPicture(), false, false);
+        deckManager.setAlwaysNonUnique(true);
 
         final Localizer localizer = Localizer.getInstance();
 
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java
index 4ea85dfce0f..c2b16c584aa 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java
@@ -17,12 +17,9 @@
  */
 package forge.screens.deckeditor.controllers;
 
-import java.util.Map.Entry;
-
 import com.google.common.base.Predicate;
 import com.google.common.base.Supplier;
 import com.google.common.collect.Iterables;
-
 import forge.deck.Deck;
 import forge.deck.DeckSection;
 import forge.game.GameType;
@@ -42,6 +39,8 @@ import forge.util.ItemPool;
 import forge.util.Localizer;
 import forge.util.storage.IStorage;
 
+import java.util.Map.Entry;
+
 /**
  * Child controller for constructed deck editor UI.
  * This is the least restrictive mode;
@@ -72,7 +71,9 @@ public final class CEditorVariant extends CDeckEditor<Deck> {
         this.sectionMode = deckSection0;
 
         final CardManager catalogManager = new CardManager(cDetailPicture0, true, false);
-        final CardManager deckManager = new CardManager(cDetailPicture0, true, false);
+        final CardManager deckManager = new CardManager(cDetailPicture0, false, false);
+        deckManager.setAlwaysNonUnique(true);
+
         final Localizer localizer = Localizer.getInstance();
 
         catalogManager.setCaption(localizer.getMessage("lblCatalog"));