diff --git a/src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java b/src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java
index 8c3f9f4..c07bc56 100644
--- a/src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java
+++ b/src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java
@@ -194,7 +194,8 @@ public class ThemeCustomizationPanel extends SettingsPanel {
 
 		button.addActionListener((evt) -> {
 			try {
-				Color newColor = (Color) JColorChooser.showDialog(null, "Choose a color", color);
+				java.awt.Color c = JColorChooser.showDialog(null, "Choose a color", color);
+				Color newColor = new Color(c.getRGB());
 				if (newColor.getRGB() != color.getRGB()) {
 					logger.log(Level.FINEST, "New Color: " + String.valueOf(color.getRGB()));
 					// TODO: When Theme changed in same settings screen, color variable doesn't