diff --git a/src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java b/src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java
index 9b1a85a..ba5da87 100644
--- a/src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java
+++ b/src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java
@@ -143,7 +143,11 @@ public class ThemeCustomizationPanel extends SettingsPanel {
 				}, (name) -> {
 					// Modify theme
 					Settings.getInstance().getThemes().replace(name, new Theme(name, temporaryTheme));
-					themes.setSelectedItem(name);
+					if(themes.getSelectedItem().equals(name)) {
+						EventBus.getInstance().dispatch(new ThemeChangeEvent(Settings.getInstance().getTheme(name)));
+					}else {
+						themes.setSelectedItem(name);
+					}
 				}).setVisible(true);
 				themeChanged = false;
 			}