diff --git a/apps/client/src/widgets/type_widgets/code/CodeMirror.tsx b/apps/client/src/widgets/type_widgets/code/CodeMirror.tsx
index f1b94a887..b6ba38fbe 100644
--- a/apps/client/src/widgets/type_widgets/code/CodeMirror.tsx
+++ b/apps/client/src/widgets/type_widgets/code/CodeMirror.tsx
@@ -12,7 +12,7 @@ export interface CodeMirrorProps extends Omit<EditorConfig, "parent"> {
     onInitialized?: () => void;
 }
 
-export default function CodeMirror({ className, content, mime, editorRef: externalEditorRef, containerRef: externalContainerRef, onInitialized, ...extraOpts }: CodeMirrorProps) {
+export default function CodeMirror({ className, content, mime, editorRef: externalEditorRef, containerRef: externalContainerRef, onInitialized, lineWrapping, ...extraOpts }: CodeMirrorProps) {
     const parentRef = useSyncedRef(externalContainerRef);
     const codeEditorRef = useRef<VanillaCodeMirror>();
 
@@ -41,6 +41,9 @@ export default function CodeMirror({ className, content, mime, editorRef: extern
         codeEditor?.clearHistory();
     }, [content]);
 
+    // React to line wrapping.
+    useEffect(() => codeEditorRef.current?.setLineWrapping(!!lineWrapping), [ lineWrapping ]);
+
     return (
         <pre ref={parentRef} className={className} />
     )
diff --git a/apps/client/src/widgets/type_widgets_old/abstract_code_type_widget.ts b/apps/client/src/widgets/type_widgets_old/abstract_code_type_widget.ts
index ab961ddf0..0ea7d1f67 100644
--- a/apps/client/src/widgets/type_widgets_old/abstract_code_type_widget.ts
+++ b/apps/client/src/widgets/type_widgets_old/abstract_code_type_widget.ts
@@ -53,11 +53,6 @@ export default class AbstractCodeTypeWidget extends TypeWidget {
         // Do nothing by default.
     }
 
-    show() {
-        this.$widget.show();
-        this.updateBackgroundColor();
-    }
-
     focus() {
         this.codeEditor.focus();
     }
@@ -67,21 +62,4 @@ export default class AbstractCodeTypeWidget extends TypeWidget {
         this.codeEditor.focus();
     }
 
-    async entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) {
-        if (loadResults.isOptionReloaded("codeNoteTheme")) {
-            const themeId = options.get("codeNoteTheme");
-            if (themeId?.startsWith(DEFAULT_PREFIX)) {
-                const theme = getThemeById(themeId.substring(DEFAULT_PREFIX.length));
-                if (theme) {
-                    await this.codeEditor.setTheme(theme);
-                }
-                this.updateBackgroundColor();
-            }
-        }
-
-        if (loadResults.isOptionReloaded("codeLineWrapEnabled")) {
-            this.codeEditor.setLineWrapping(options.is("codeLineWrapEnabled"));
-        }
-    }
-
 }