diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java
index 7706c3a327d..9cf4af5a098 100644
--- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java
+++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java
@@ -162,7 +162,7 @@ public final class CEditorLimited extends ACEditorBase<PaperCard, DeckGroup> {
      */
     @Override
     public void update() {
-        this.getCatalogManager().setup(SColumnUtil.getCatalogDefaultColumns(), GroupDef.CREATURE_SPELL_LAND, ColumnDef.CMC, 1);
+        this.getCatalogManager().setup(SColumnUtil.getCatalogDefaultColumns(), getScreen() == FScreen.DECK_EDITOR_DRAFT ? GroupDef.CREATURE_SPELL_LAND : GroupDef.COLOR, ColumnDef.CMC, 1);
         this.getDeckManager().setup(SColumnUtil.getDeckDefaultColumns(), GroupDef.CREATURE_SPELL_LAND, ColumnDef.CMC, 1);
 
         SItemManagerUtil.resetUI(this);
diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/GroupDef.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/GroupDef.java
index ed80412d330..17f7e3295f0 100644
--- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/GroupDef.java
+++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/GroupDef.java
@@ -152,30 +152,30 @@ public enum GroupDef {
 
     private static String[] getColorGroups() {
         //TODO: Support breaking up Multicolor into separate groups for each color combination
-        return new String[] { "Colorless", "White", "Blue", "Black", "Red", "Green", "Multicolor" };
+        return new String[] { "White", "Blue", "Black", "Red", "Green", "Multicolor", "Colorless" };
     }
 
     private static Integer getColorGroup(ColorSet color) {
         if (color.isColorless()) {
-            return 0;
-        }
-        if (color.isMulticolor()) {
             return 6;
         }
+        if (color.isMulticolor()) {
+            return 5;
+        }
         if (color.hasWhite()) {
-            return 1;
+            return 0;
         }
         if (color.hasBlue()) {
-            return 2;
+            return 1;
         }
         if (color.hasBlack()) {
-            return 3;
+            return 2;
         }
         if (color.hasRed()) {
-            return 4;
+            return 3;
         }
         if (color.hasGreen()) {
-            return 5;
+            return 4;
         }
         return -1; //shouldn't happen
     }