diff --git a/apps/client/src/widgets/type_widgets/options/code_notes/code_editor.ts b/apps/client/src/widgets/type_widgets/options/code_notes/code_editor.ts
index f99b12b50..8749024a9 100644
--- a/apps/client/src/widgets/type_widgets/options/code_notes/code_editor.ts
+++ b/apps/client/src/widgets/type_widgets/options/code_notes/code_editor.ts
@@ -10,30 +10,19 @@ const TPL = /*html*/`
         ${t("vim_key_bindings.use_vim_keybindings_in_code_notes")}
     </label>
     <p class="form-text">${t("vim_key_bindings.enable_vim_keybindings")}</p>
-
-    <label class="tn-checkbox">
-        <input type="checkbox" class="line-wrap-enabled form-check-input">
-        ${t("wrap_lines.wrap_lines_in_code_notes")}
-    </label>
-    <p class="form-text">${t("wrap_lines.enable_line_wrap")}</p>
 </div>`;
 
 export default class CodeEditorOptions extends OptionsWidget {
 
     private $vimKeymapEnabled!: JQuery<HTMLElement>;
-    private $codeLineWrapEnabled!: JQuery<HTMLElement>;
 
     doRender() {
         this.$widget = $(TPL);
         this.$vimKeymapEnabled = this.$widget.find(".vim-keymap-enabled");
         this.$vimKeymapEnabled.on("change", () => this.updateCheckboxOption("vimKeymapEnabled", this.$vimKeymapEnabled));
-
-        this.$codeLineWrapEnabled = this.$widget.find(".line-wrap-enabled");
-        this.$codeLineWrapEnabled.on("change", () => this.updateCheckboxOption("codeLineWrapEnabled", this.$codeLineWrapEnabled));
     }
 
     async optionsLoaded(options: OptionMap) {
         this.setCheckboxState(this.$vimKeymapEnabled, options.vimKeymapEnabled);
-        this.setCheckboxState(this.$codeLineWrapEnabled, options.codeLineWrapEnabled);
     }
 }
diff --git a/apps/client/src/widgets/type_widgets/options/code_notes/code_theme.ts b/apps/client/src/widgets/type_widgets/options/code_notes/code_theme.ts
index 9198d9d6f..e9cf62426 100644
--- a/apps/client/src/widgets/type_widgets/options/code_notes/code_theme.ts
+++ b/apps/client/src/widgets/type_widgets/options/code_notes/code_theme.ts
@@ -90,6 +90,13 @@ const TPL = /*html*/`\
             <label for="color-theme">Color scheme</label>
             <select id="color-theme" class="theme-select form-select"></select>
         </div>
+
+        <div class="col-md-6 side-checkbox">
+            <label class="form-check tn-checkbox">
+                <input type="checkbox" class="word-wrap form-check-input" />
+                Word Wrapping
+            </label>
+        </div>
     </div>
 
     <div class="note-detail-readonly-code-content">
@@ -111,6 +118,7 @@ export default class CodeTheme extends OptionsWidget {
 
     private $themeSelect!: JQuery<HTMLElement>;
     private $sampleEl!: JQuery<HTMLElement>;
+    private $lineWrapEnabled!: JQuery<HTMLElement>;
     private editor?: CodeMirror;
 
     doRender() {
@@ -121,6 +129,8 @@ export default class CodeTheme extends OptionsWidget {
             await server.put(`options/codeNoteTheme/${newTheme}`);
         });
         this.$sampleEl = this.$widget.find(".note-detail-readonly-code-content");
+        this.$lineWrapEnabled = this.$widget.find(".word-wrap");
+        this.$lineWrapEnabled.on("change", () => this.updateCheckboxOption("codeLineWrapEnabled", this.$lineWrapEnabled));
     }
 
     async #setupPreview(options: OptionMap) {
@@ -153,6 +163,7 @@ export default class CodeTheme extends OptionsWidget {
 
         this.$themeSelect.val(options.codeNoteTheme);
         this.#setupPreview(options);
+        this.setCheckboxState(this.$lineWrapEnabled, options.codeLineWrapEnabled);
     }
 
 }