diff --git a/app/components/PageTheme.js b/app/components/PageTheme.js
index 2914f78b2..3b3fa9a91 100644
--- a/app/components/PageTheme.js
+++ b/app/components/PageTheme.js
@@ -29,6 +29,12 @@ export default function PageTheme() {
         ui.resolvedTheme === "dark" ? "black-translucent" : "default"
       );
     }
+
+    // user-agent controls and scrollbars
+    const csElement = document.querySelector('meta[name="color-scheme"]');
+    if (csElement) {
+      csElement.setAttribute("content", ui.resolvedTheme);
+    }
   }, [theme, ui.resolvedTheme]);
 
   return null;
diff --git a/server/static/index.html b/server/static/index.html
index ee2b95367..fbf0fc141 100644
--- a/server/static/index.html
+++ b/server/static/index.html
@@ -5,6 +5,7 @@
     <meta name="theme-color" content="#FFF" />
     <meta name="slack-app-id" content="//inject-slack-app-id//" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="color-scheme" content="light dark">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
     <meta name="description" content="A modern team knowledge base for your internal documentation, product specs, support answers, meeting notes, onboarding, &amp; more…">