diff --git a/keepassxc-browser/manifest.json b/keepassxc-browser/manifest.json
index d725820..6f0ea64 100755
--- a/keepassxc-browser/manifest.json
+++ b/keepassxc-browser/manifest.json
@@ -146,6 +146,7 @@
         "http://*/*",
         "https://api.github.com/"
     ],
+    "content_security_policy": "script-src 'self' 'sha256-UD5WN2QEhRDEZ6vkLdHKFlkHwzbemzW2ppJiOLooI8o='; object-src 'none'",
     "applications": {
        "gecko": {
            "id": "keepassxc-browser@keepassxc.org",
diff --git a/keepassxc-browser/options/options.html b/keepassxc-browser/options/options.html
index bbee559..4dbc7cf 100644
--- a/keepassxc-browser/options/options.html
+++ b/keepassxc-browser/options/options.html
@@ -20,6 +20,13 @@
     <script src="../common/translate.js" defer></script>
   </head>
   <body class="pt-3 pb-5">
+    <script>
+    // We eagerly load the theme here to avoid a white flash
+    let colorTheme = localStorage.getItem('colorTheme');
+    if (colorTheme) {
+      document.body.setAttribute('data-color-theme', colorTheme);
+    }
+    </script>
     <div class="container-fluid">
       <div class="row">
         <nav class="col-md-3 col-lg-2 sidebar">
diff --git a/keepassxc-browser/options/options.js b/keepassxc-browser/options/options.js
index 2669dd0..7ba0475 100644
--- a/keepassxc-browser/options/options.js
+++ b/keepassxc-browser/options/options.js
@@ -75,6 +75,8 @@ options.initGeneralSettings = function() {
 
     $('#tab-general-settings select#colorTheme').change(async function() {
         options.settings['colorTheme'] = $(this).val();
+        // The theme is also stored in localStorage to prevent a white flash when the settings are first opened
+        localStorage.setItem('colorTheme', options.settings['colorTheme']);
         await options.saveSettings();
         location.reload();
     });
@@ -608,6 +610,11 @@ options.initTheme = function() {
     } else {
         document.body.setAttribute('data-color-theme', options.settings['colorTheme']);
     }
+    // Sync localStorage setting
+    let localStorageTheme = localStorage.getItem('colorTheme');
+    if (localStorageTheme !== options.settings['colorTheme']) {
+        localStorage.setItem('colorTheme', options.settings['colorTheme']);
+    }
 };
 
 options.createWarning = function(elem, text) {
