diff --git a/forge-gui-desktop/src/main/java/forge/deckchooser/DecksComboBox.java b/forge-gui-desktop/src/main/java/forge/deckchooser/DecksComboBox.java
index 32ef5928063..82385e0bdc4 100644
--- a/forge-gui-desktop/src/main/java/forge/deckchooser/DecksComboBox.java
+++ b/forge-gui-desktop/src/main/java/forge/deckchooser/DecksComboBox.java
@@ -26,7 +26,7 @@ public class DecksComboBox extends FComboBoxWrapper<DeckType> {
     }
 
     public void refresh(final DeckType deckType) {
-        setModel(new DefaultComboBoxModel<DeckType>(DeckType.values()));
+        setModel(new DefaultComboBoxModel<DeckType>(DeckType.ConstructedOptions));
         setSelectedItem(deckType);
     }
 
diff --git a/forge-gui/src/main/java/forge/deck/DeckType.java b/forge-gui/src/main/java/forge/deck/DeckType.java
index 3d34cf63a4f..9aeb9d6c589 100644
--- a/forge-gui/src/main/java/forge/deck/DeckType.java
+++ b/forge-gui/src/main/java/forge/deck/DeckType.java
@@ -16,6 +16,16 @@ public enum DeckType {
     NET_DECK ("Net Decks"),
     NET_COMMANDER_DECK ("Net Commander Decks");
 
+    public static final DeckType[] ConstructedOptions = new DeckType[] {
+        DeckType.CUSTOM_DECK,
+        DeckType.PRECONSTRUCTED_DECK,
+        DeckType.QUEST_OPPONENT_DECK,
+        DeckType.COLOR_DECK,
+        DeckType.THEME_DECK,
+        DeckType.RANDOM_DECK,
+        DeckType.NET_DECK
+    };
+
     private String value;
     private DeckType(final String value) {
         this.value = value;
diff --git a/forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java b/forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java
index 24215303824..76f40590a06 100644
--- a/forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java
+++ b/forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java
@@ -81,7 +81,7 @@ public class RandomDeckGenerator extends DeckProxy implements Comparable<RandomD
             return DeckgenUtil.generatePlanarDeck();
         default:
             while (true) {
-                switch (Aggregates.random(DeckType.values())) {
+                switch (Aggregates.random(DeckType.ConstructedOptions)) {
                 case PRECONSTRUCTED_DECK:
                     return Aggregates.random(DeckProxy.getAllPreconstructedDecks(QuestController.getPrecons())).getDeck();
                 case QUEST_OPPONENT_DECK: