diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 4c5d50f9e1..4edfa52354 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -269,6 +269,10 @@ $selected-color: $room-highlight-color;
 }
 // ********************
 
+body {
+    color-scheme: dark;
+}
+
 // Nasty hacks to apply a filter to arbitrary monochrome artwork to make it
 // better match the theme.  Typically applied to dark grey 'off' buttons or
 // light grey 'on' buttons.
diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
index 8997538e0a..89db8827a0 100644
--- a/res/themes/legacy-dark/css/_legacy-dark.scss
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -242,6 +242,10 @@ $location-live-secondary-color: #deddfd;
     text-decoration: none;
 }
 
+body {
+    color-scheme: dark;
+}
+
 // Nasty hacks to apply a filter to arbitrary monochrome artwork to make it
 // better match the theme.  Typically applied to dark grey 'off' buttons or
 // light grey 'on' buttons.
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index 49f690d6a0..4121ca8f6a 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -347,6 +347,10 @@ $location-live-secondary-color: #deddfd;
     text-decoration: none;
 }
 
+body {
+    color-scheme: light;
+}
+
 // diff highlight colors
 .hljs-addition {
     background: #dfd;
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index bd7194e5fb..6354087265 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -378,6 +378,10 @@ $location-live-secondary-color: #deddfd;
     text-decoration: none;
 }
 
+body {
+    color-scheme: light;
+}
+
 // ********************
 
 // diff highlight colors