diff --git a/src/main/java/forge/gui/home/variant/CSubmenuArchenemy.java b/src/main/java/forge/gui/home/variant/CSubmenuArchenemy.java
index 5cd063e39a5..da6240a1f30 100644
--- a/src/main/java/forge/gui/home/variant/CSubmenuArchenemy.java
+++ b/src/main/java/forge/gui/home/variant/CSubmenuArchenemy.java
@@ -156,10 +156,15 @@ public enum CSubmenuArchenemy implements ICDoc {
                     if (obj instanceof String) {
                         String sel = (String) obj;
                         if (sel.equals("Random")) {
-
-                            schemes = Aggregates.random(view.getAllSchemeDecks()).getSideboard().toFlatList();
+                            if (view.getAllSchemeDecks().isEmpty()) {
+                                //Generate if no constructed scheme decks are available
+                                System.out.println("Generating scheme deck - no others available");
+                                schemes = DeckgenUtil.generateSchemeDeck().getSideboard().toFlatList();
+                            } else {
+                                System.out.println("Using scheme deck: " + Aggregates.random(view.getAllSchemeDecks()).getName());
+                                schemes = Aggregates.random(view.getAllSchemeDecks()).getSideboard().toFlatList();
+                            }
                         } else {
-
                             //Generate
                             schemes = DeckgenUtil.generateSchemeDeck().getSideboard().toFlatList();
                         }
diff --git a/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java b/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java
index acc3b2ff5d9..f29c0a05085 100644
--- a/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java
+++ b/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java
@@ -122,6 +122,12 @@ public enum VSubmenuArchenemy implements IVSubmenu<CSubmenuArchenemy> {
         settingsPanel.add(lblEditor);
         tabPane.add("Settings", settingsPanel);
 
+        for (Deck schemeDeck : Singletons.getModel().getDecks().getScheme()) {
+            if (!allSchemeDecks.contains(schemeDeck)) {
+                allSchemeDecks.add(schemeDeck);
+            }
+        }
+
         //Player panels (Human + 7 AIs)
         for (int i = 0; i < 8; i++) {
             tempPanel = new FPanel();