diff --git a/unix/vncviewer/OptionsDialog.h b/unix/vncviewer/OptionsDialog.h
index 68ce8d6..44b662c 100644
--- a/unix/vncviewer/OptionsDialog.h
+++ b/unix/vncviewer/OptionsDialog.h
@@ -145,7 +145,7 @@
     sendPrimary.disabled(!sendClipboard.checked());
     dotWhenNoCursor.disabled(!useLocalCursor.checked());
     compressLevel.disabled(!customCompressLevel.checked());
-    qualityLevel.disabled(!noJpeg.checked());
+    qualityLevel.disabled(autoSelect.checked() || !noJpeg.checked());
   }
 
   virtual void takeFocus(Time time) {
@@ -171,6 +171,7 @@
       mediumColour.disabled(autoSelect.checked());
       lowColour.disabled(autoSelect.checked());
       veryLowColour.disabled(autoSelect.checked());
+      qualityLevel.disabled(autoSelect.checked() || !noJpeg.checked());
     } else if (checkbox == &fullColour || checkbox == &mediumColour ||
                checkbox == &lowColour || checkbox == &veryLowColour) {
       fullColour.checked(checkbox == &fullColour);
@@ -189,7 +190,7 @@
     } else if (checkbox == &customCompressLevel) {
       compressLevel.disabled(!customCompressLevel.checked());
     } else if (checkbox == &noJpeg) {
-      qualityLevel.disabled(!noJpeg.checked());
+      qualityLevel.disabled(autoSelect.checked() || !noJpeg.checked());
     }
   }