diff --git a/src/public/app/widgets/touch_bar.ts b/src/public/app/widgets/touch_bar.ts
index 38235a51d..7f7ef10d5 100644
--- a/src/public/app/widgets/touch_bar.ts
+++ b/src/public/app/widgets/touch_bar.ts
@@ -2,19 +2,8 @@ import utils from "../services/utils.js";
 import Component from "../components/component.js";
 import appContext from "../components/app_context.js";
 import NoteContextAwareWidget from "./note_context_aware_widget.js";
-import type FNote from "../entities/fnote.js";
 import type { TouchBarButton, TouchBarGroup, TouchBarSegmentedControl, TouchBarSpacer } from "@electron/remote";
 
-async function triggerTextEditorCommand(command: string, args?: object) {
-    const editor = await appContext.tabManager.getActiveContext().getTextEditor();
-    if (!editor) {
-        return;
-    }
-
-    // TODO: Fix type of editor.
-    (editor as any).execute(command, args);
-}
-
 export default class TouchBarWidget extends NoteContextAwareWidget {
 
     nativeImage: typeof import("electron").nativeImage;
diff --git a/src/public/app/widgets/type_widgets/editable_text.js b/src/public/app/widgets/type_widgets/editable_text.js
index c950a562b..a6efbbe11 100644
--- a/src/public/app/widgets/type_widgets/editable_text.js
+++ b/src/public/app/widgets/type_widgets/editable_text.js
@@ -510,6 +510,8 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
     buildTouchBarCommand(data) {
         const { TouchBar, buildIcon } = data;
         const { TouchBarSegmentedControl, TouchBarGroup, TouchBarButton } = TouchBar;
+        const { editor } = this.watchdog;
+
         return [
             new TouchBarSegmentedControl({
                 segments: [
@@ -520,13 +522,13 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
                 change(selectedIndex, isSelected) {
                     switch (selectedIndex) {
                         case 0:
-                            triggerTextEditorCommand("paragraph")
+                            editor.execute("paragraph")
                             break;
                         case 1:
-                            triggerTextEditorCommand("heading", { value: "heading2" });
+                            editor.execute("heading", { value: "heading2" });
                             break;
                         case 2:
-                            triggerTextEditorCommand("heading", { value: "heading3" });
+                            editor.execute("heading", { value: "heading3" });
                             break;
                     }
                 },
@@ -536,15 +538,15 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
                     items: [
                         new TouchBarButton({
                             icon: buildIcon("NSTouchBarTextBoldTemplate"),
-                            click: () => triggerTextEditorCommand("bold")
+                            click: () => editor.execute("bold")
                         }),
                         new TouchBarButton({
                             icon: buildIcon("NSTouchBarTextItalicTemplate"),
-                            click: () => triggerTextEditorCommand("italic")
+                            click: () => editor.execute("italic")
                         }),
                         new TouchBarButton({
                             icon: buildIcon("NSTouchBarTextUnderlineTemplate"),
-                            click: () => triggerTextEditorCommand("underline")
+                            click: () => editor.execute("underline")
                         })
                     ]
                 })