diff --git a/apps/client/src/stylesheets/style.css b/apps/client/src/stylesheets/style.css
index 0d4ade2a8..a2c39df46 100644
--- a/apps/client/src/stylesheets/style.css
+++ b/apps/client/src/stylesheets/style.css
@@ -422,7 +422,6 @@ body.desktop #context-menu-container .dropdown-item > span {
 
 .cm-editor {
     height: 100%;
-    background: inherit;
     outline: none !important;
 }
 
diff --git a/apps/client/src/stylesheets/theme-dark.css b/apps/client/src/stylesheets/theme-dark.css
index d1125d097..3b7a8fcc2 100644
--- a/apps/client/src/stylesheets/theme-dark.css
+++ b/apps/client/src/stylesheets/theme-dark.css
@@ -81,10 +81,6 @@ body ::-webkit-calendar-picker-indicator {
     filter: invert(1);
 }
 
-body .cm-editor {
-    filter: invert(90%) hue-rotate(180deg);
-}
-
 .excalidraw.theme--dark {
     --theme-filter: invert(80%) hue-rotate(180deg) !important;
 }
diff --git a/apps/client/src/stylesheets/theme-next-dark.css b/apps/client/src/stylesheets/theme-next-dark.css
index 967a4ee43..c32a01e84 100644
--- a/apps/client/src/stylesheets/theme-next-dark.css
+++ b/apps/client/src/stylesheets/theme-next-dark.css
@@ -244,10 +244,6 @@ body ::-webkit-calendar-picker-indicator {
     filter: invert(1);
 }
 
-body .cm-editor {
-    filter: invert(90%) hue-rotate(180deg);
-}
-
 .excalidraw.theme--dark {
     --theme-filter: invert(80%) hue-rotate(180deg) !important;
 }
diff --git a/apps/client/src/widgets/type_widgets/abstract_code_type_widget.ts b/apps/client/src/widgets/type_widgets/abstract_code_type_widget.ts
index 6dd68139a..85d749653 100644
--- a/apps/client/src/widgets/type_widgets/abstract_code_type_widget.ts
+++ b/apps/client/src/widgets/type_widgets/abstract_code_type_widget.ts
@@ -1,3 +1,4 @@
+import { getThemeById } from "@triliumnext/codemirror";
 import type FNote from "../../entities/fnote.js";
 import options from "../../services/options.js";
 import TypeWidget from "./type_widget.js";
@@ -31,6 +32,12 @@ export default class AbstractCodeTypeWidget extends TypeWidget {
             lineWrapping: options.is("codeLineWrapEnabled"),
             ...this.getExtraOpts()
         });
+
+        // Load the theme.
+        const theme = getThemeById(options.get("codeNoteTheme"));
+        if (theme) {
+            await this.codeEditor.setTheme(theme);
+        }
     }
 
     /**
diff --git a/packages/codemirror/src/color_themes.ts b/packages/codemirror/src/color_themes.ts
index a03a8b57d..feef99635 100644
--- a/packages/codemirror/src/color_themes.ts
+++ b/packages/codemirror/src/color_themes.ts
@@ -16,4 +16,14 @@ const themes: ThemeDefinition[] = [
     }
 ]
 
+export function getThemeById(id: string) {
+    for (const theme of themes) {
+        if (theme.id === id) {
+            return theme;
+        }
+    }
+
+    return null;
+}
+
 export default themes;
diff --git a/packages/codemirror/src/index.ts b/packages/codemirror/src/index.ts
index f6560920c..7272d151e 100644
--- a/packages/codemirror/src/index.ts
+++ b/packages/codemirror/src/index.ts
@@ -8,7 +8,7 @@ import byMimeType from "./syntax_highlighting.js";
 import smartIndentWithTab from "./extensions/custom_tab.js";
 import type { ThemeDefinition } from "./color_themes.js";
 
-export { default as ColorThemes, type ThemeDefinition } from "./color_themes.js";
+export { default as ColorThemes, type ThemeDefinition, getThemeById } from "./color_themes.js";
 
 type ContentChangedListener = () => void;
 
@@ -42,8 +42,9 @@ export default class CodeMirror extends EditorView {
         extensions = [
             ...extensions,
             languageCompartment.of([]),
-            syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
-            themeCompartment.of([]),
+            themeCompartment.of([
+                syntaxHighlighting(defaultHighlightStyle, { fallback: true })
+            ]),
             highlightActiveLine(),
             highlightSelectionMatches(),
             bracketMatching(),
@@ -108,7 +109,10 @@ export default class CodeMirror extends EditorView {
     }
 
     async setTheme(theme: ThemeDefinition) {
-        this.themeCompartment.reconfigure(await theme.load());
+        const extension = await theme.load();
+        this.dispatch({
+            effects: [ this.themeCompartment.reconfigure([ extension ]) ]
+        });
     }
 
     /**