1 files changed, 23 insertions, 5 deletions

diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 1e290f8be..e95cae18b 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -1,9 +1,16 @@
+/* eslint-disable import/first */
 import { ipcRenderer } from 'electron';
 import path from 'path';
 import { autorun, computed, observable } from 'mobx';
 import fs from 'fs-extra';
 import { loadModule } from 'cld3-asm';
 import { debounce } from 'lodash';
+
+// For some services darkreader tries to use the chrome extension message API
+// This will cause the service to fail loading
+// As the message API is not actually needed, we'll add this shim sendMessage
+// function in order for darkreader to continue working
+window.chrome.runtime.sendMessage = () => {};
 import {
   enable as enableDarkMode,
   disable as disableDarkMode,
@@ -120,8 +127,13 @@ class RecipeController {
       }
     }
 
-    console.log('Set theme to: ', this.settings.service.isDarkModeEnabled ? 'Dark' : 'Light');
-    if (this.settings.service.isDarkModeEnabled) {
+    console.log(
+      'Darkmode enabled?',
+      this.settings.service.isDarkModeEnabled,
+      'Dark theme active?',
+      this.settings.app.isDarkThemeActive,
+    );
+    if (this.settings.service.isDarkModeEnabled && this.settings.app.isDarkThemeActive !== false) {
       debug('Enable dark mode');
 
       // Check if recipe has a darkmode.css
@@ -162,9 +174,15 @@ class RecipeController {
     }
 
     // Remove dark reader if (universal) dark mode was just disabled
-    if (this.universalDarkModeInjected && (!this.settings.service.isDarkModeEnabled || !this.settings.app.universalDarkMode)) {
-      disableDarkMode();
-      this.universalDarkModeInjected = false;
+    if (this.universalDarkModeInjected) {
+      if (
+        !this.settings.app.darkMode
+        || !this.settings.service.isDarkModeEnabled
+        || !this.settings.app.universalDarkMode
+      ) {
+        disableDarkMode();
+        this.universalDarkModeInjected = false;
+      }
     }
   }