diff --git a/GUI/Controls/ColoredTextBox.cs b/GUI/Controls/ColoredTextBox.cs
index d29556752..e5a83c456 100644
--- a/GUI/Controls/ColoredTextBox.cs
+++ b/GUI/Controls/ColoredTextBox.cs
@@ -166,8 +166,9 @@ namespace MCGalaxy.Gui.Components {
             if (c == 'S' || c == 'f' || c == 'F' || c == '0') return foreCol;
             Colors.Map(ref c);
 
-            if (!Colors.IsDefined(c)) return foreCol;
             ColorDesc col = Colors.Get(c);
+            if (col.Undefined) return foreCol;
+            
             return Color.FromArgb(col.R, col.G, col.B);
         }
     }
diff --git a/MCGalaxy/Commands/CPE/CmdCustomColors.cs b/MCGalaxy/Commands/CPE/CmdCustomColors.cs
index 24e261471..d3904c929 100644
--- a/MCGalaxy/Commands/CPE/CmdCustomColors.cs
+++ b/MCGalaxy/Commands/CPE/CmdCustomColors.cs
@@ -99,7 +99,7 @@ namespace MCGalaxy.Commands.CPE {
             
             char code = ParseColor(p, args[1]);
             if (code == '\0') return;
-            ColorDesc col = Colors.List[code];
+            ColorDesc col = Colors.Get(code);
             
             if (args[2].CaselessEq("name")) {
                 if (!CheckName(p, args[3])) return;