diff --git a/src/js/messaging.js b/src/js/messaging.js
index f6994d69d..19dfe43a6 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -890,7 +890,12 @@ const onMessage = function(request, sender, callback) {
                 mouse: µb.epickerArgs.mouse,
                 zap: µb.epickerArgs.zap,
                 eprom: µb.epickerArgs.eprom,
-                pickerURL: vAPI.getURL(`/web_accessible_resources/epicker-ui.html?secret=${vAPI.warSecret()}`),
+                pickerURL: vAPI.getURL(
+                    `/web_accessible_resources/epicker-ui.html?secret=${vAPI.warSecret()}`
+                ),
+                needColorScheme:
+                    vAPI.webextFlavor.soup.has('firefox') === false ||
+                    vAPI.webextFlavor.major < 106,
             });
             µb.epickerArgs.target = '';
         });
diff --git a/src/js/scriptlets/epicker.js b/src/js/scriptlets/epicker.js
index e288e78b0..5ef8b0bff 100644
--- a/src/js/scriptlets/epicker.js
+++ b/src/js/scriptlets/epicker.js
@@ -1281,11 +1281,15 @@ const pickerCSSStyle = [
     'visibility: visible',
     'width: 100%',
     'z-index: 2147483647',
-    // https://github.com/uBlockOrigin/uBlock-issues/issues/1408
-    'color-scheme: light',
-    ''
 ];
 
+// https://github.com/uBlockOrigin/uBlock-issues/issues/1408
+// https://github.com/uBlockOrigin/uBlock-issues/issues/2240
+if ( pickerBootArgs.needColorScheme ) {
+    pickerCSSStyle.push('color-scheme: light');
+}
+pickerCSSStyle.push(''); // Important
+
 const pickerCSS = `
 :root > [${vAPI.sessionId}] {
     ${pickerCSSStyle.join(' !important;')}