diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java b/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java
index 4fa5fcc73c..054543fa9d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java
@@ -85,8 +85,8 @@ public class FragmentDialogTheme extends FragmentDialogBase {
 
         swBlack.setEnabled(colored && !grey && !bw && !solarized && optionId != R.id.rbThemeLight);
 
-        swHtmlLight.setEnabled(!(colored || blank) || (colored && optionId != R.id.rbThemeLight));
-        swComposerLight.setEnabled(!(colored || blank) || (colored && optionId != R.id.rbThemeLight));
+        swHtmlLight.setEnabled(colored ? optionId != R.id.rbThemeLight : !blank);
+        swComposerLight.setEnabled(colored ? optionId != R.id.rbThemeLight : !blank);
     }
 
     @NonNull