diff --git a/apps/client/src/layouts/desktop_layout.ts b/apps/client/src/layouts/desktop_layout.ts
index c91417a40..15420b260 100644
--- a/apps/client/src/layouts/desktop_layout.ts
+++ b/apps/client/src/layouts/desktop_layout.ts
@@ -266,6 +266,7 @@ export default class DesktopLayout {
                     .cssBlock(".title-row > * { margin: 5px; }")
                     .child(new NoteIconWidget())
                     .child(new NoteTitleWidget()))
+                .child(new ClassicEditorToolbar())
                 .child(new NoteDetailWidget()));
 
         applyModals(rootContainer);
diff --git a/apps/client/src/widgets/dialogs/popup_editor.ts b/apps/client/src/widgets/dialogs/popup_editor.ts
index 8cd7be04b..6615b0a78 100644
--- a/apps/client/src/widgets/dialogs/popup_editor.ts
+++ b/apps/client/src/widgets/dialogs/popup_editor.ts
@@ -76,7 +76,6 @@ export default class PopupEditorDialog extends Container<BasicWidget> {
         const $modalBody = $newWidget.find(".modal-body");
 
         const children = this.$widget.children();
-        console.log("Got children", children);
         $modalHeader.append(children[0]);
         $modalBody.append(children.slice(1));
         this.$widget = $newWidget;
diff --git a/apps/client/src/widgets/type_widgets/editable_text.ts b/apps/client/src/widgets/type_widgets/editable_text.ts
index 8db9f3164..3bb5754a2 100644
--- a/apps/client/src/widgets/type_widgets/editable_text.ts
+++ b/apps/client/src/widgets/type_widgets/editable_text.ts
@@ -178,13 +178,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
             });
 
             if (isClassicEditor) {
-                let $classicToolbarWidget;
-                if (!utils.isMobile()) {
-                    const $parentSplit = this.$widget.parents(".note-split.type-text");
-                    $classicToolbarWidget = $parentSplit.find("> .ribbon-container .classic-toolbar-widget");
-                } else {
-                    $classicToolbarWidget = $("body").find(".classic-toolbar-widget");
-                }
+                const $classicToolbarWidget = this.findClassicToolbar();
 
                 $classicToolbarWidget.empty();
                 if ($classicToolbarWidget.length) {
@@ -515,6 +509,22 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
         }
     }
 
+    findClassicToolbar(): JQuery<HTMLElement> {
+        if (!utils.isMobile()) {
+            const $parentSplit = this.$widget.parents(".note-split.type-text");
+
+            if ($parentSplit.length) {
+                // The editor is in a normal tab.
+                return $parentSplit.find("> .ribbon-container .classic-toolbar-widget");
+            } else {
+                // The editor is in a popup.
+                return this.$widget.closest(".modal-body").find(".classic-toolbar-widget");
+            }
+        } else {
+            return $("body").find(".classic-toolbar-widget");
+        }
+    }
+
     buildTouchBarCommand(data: CommandListenerData<"buildTouchBar">) {
         const { TouchBar, buildIcon } = data;
         const { TouchBarSegmentedControl, TouchBarGroup, TouchBarButton } = TouchBar;