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 a08da9e6a12..2416030b9eb 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
@@ -82,17 +82,11 @@ public final class CEditorConstructed extends CDeckEditor<Deck> {
         switch (this.gameType) {
             case Constructed:
                 allSections.add(DeckSection.Avatar);
-                allSections.add(DeckSection.Schemes);
-                allSections.add(DeckSection.Planes);
                 allSections.add(DeckSection.Conspiracy);
-                allSections.add(DeckSection.Dungeon);
 
                 normalPool = FModel.getAllCardsNoAlt();
                 avatarPool = FModel.getAvatarPool();
-                planePool = FModel.getPlanechaseCards();
-                schemePool = FModel.getArchenemyCards();
                 conspiracyPool = FModel.getConspiracyPool();
-                dungeonPool = FModel.getDungeonPool();
 
                 break;
             case Commander:
@@ -130,6 +124,14 @@ public final class CEditorConstructed extends CDeckEditor<Deck> {
             default:
         }
 
+        allSections.add(DeckSection.Planes);
+        allSections.add(DeckSection.Schemes);
+        allSections.add(DeckSection.Dungeon);
+
+        planePool = FModel.getPlanechaseCards();
+        schemePool = FModel.getArchenemyCards();
+        dungeonPool = FModel.getDungeonPool();
+
         allSections.add(DeckSection.Attractions);
         attractionPool = FModel.getAttractionPool();