diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index c277fc09f..f6ff51636 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -672,7 +672,6 @@
  ******************************************************************************/
 
 .choice-box {
-	-fx-text-fill: TEXT_FILL;
 	-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_NORMAL;
 	-fx-background-insets: 0, 1px;
 	-fx-background-radius: 4px;
@@ -683,6 +682,18 @@
 	-fx-background-color: CONTROL_BORDER_FOCUSED, CONTROL_BG_NORMAL;
 }
 
+.choice-box:disabled {
+	-fx-background-color: CONTROL_BORDER_DISABLED, CONTROL_BG_DISABLED;
+}
+
+.choice-box > .label {
+	-fx-text-fill: TEXT_FILL;
+}
+
+.choice-box:disabled > .label {
+	-fx-text-fill: TEXT_FILL_SECONDARY;
+}
+
 .choice-box > .open-button {
 	-fx-padding: 0 0 0 0.3em;
 }
@@ -694,6 +705,10 @@
 	-fx-shape: "M 0 0 h 7 l -3.5 4 z";
 }
 
+.choice-box:disabled > .open-button > .arrow {
+	-fx-background-color: transparent, TEXT_FILL_SECONDARY;
+}
+
 .choice-box .context-menu {
 	-fx-translate-x: -1.4em;
 }
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index a4ad762ed..330f41d74 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -672,7 +672,6 @@
  ******************************************************************************/
 
 .choice-box {
-	-fx-text-fill: TEXT_FILL;
 	-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_NORMAL;
 	-fx-background-insets: 0, 1px;
 	-fx-background-radius: 4px;
@@ -683,6 +682,18 @@
 	-fx-background-color: CONTROL_BORDER_FOCUSED, CONTROL_BG_NORMAL;
 }
 
+.choice-box:disabled {
+	-fx-background-color: CONTROL_BORDER_DISABLED, CONTROL_BG_DISABLED;
+}
+
+.choice-box > .label {
+	-fx-text-fill: TEXT_FILL;
+}
+
+.choice-box:disabled > .label {
+	-fx-text-fill: TEXT_FILL_SECONDARY;
+}
+
 .choice-box > .open-button {
 	-fx-padding: 0 0 0 0.3em;
 }
@@ -694,6 +705,10 @@
 	-fx-shape: "M 0 0 h 7 l -3.5 4 z";
 }
 
+.choice-box:disabled > .open-button > .arrow {
+	-fx-background-color: transparent, TEXT_FILL_SECONDARY;
+}
+
 .choice-box .context-menu {
 	-fx-translate-x: -1.4em;
 }