diff --git a/apps/client/src/services/dialog.ts b/apps/client/src/services/dialog.ts
index 240172f49..298c7bf8a 100644
--- a/apps/client/src/services/dialog.ts
+++ b/apps/client/src/services/dialog.ts
@@ -4,14 +4,14 @@ import type { ConfirmDialogOptions, ConfirmDialogResult, ConfirmWithMessageOptio
 import type { PromptDialogOptions } from "../widgets/dialogs/prompt.js";
 import { focusSavedElement, saveFocusedElement } from "./focus.js";
 
-export async function openDialog($dialog: JQuery<HTMLElement>, closeActDialog = true) {
+export async function openDialog($dialog: JQuery<HTMLElement>, closeActDialog = true, config?: Partial<Modal.Options>) {
     if (closeActDialog) {
         closeActiveDialog();
         glob.activeDialog = $dialog;
     }
 
     saveFocusedElement();
-    Modal.getOrCreateInstance($dialog[0]).show();
+    Modal.getOrCreateInstance($dialog[0], config).show();
 
     $dialog.on("hidden.bs.modal", () => {
         const $autocompleteEl = $(".aa-input");
diff --git a/apps/client/src/stylesheets/style.css b/apps/client/src/stylesheets/style.css
index 60e4856f7..d7ad33923 100644
--- a/apps/client/src/stylesheets/style.css
+++ b/apps/client/src/stylesheets/style.css
@@ -540,6 +540,7 @@ button.btn-sm {
     /* Making this narrower because https://github.com/zadam/trilium/issues/502 (problem only in smaller font sizes) */
     min-width: 0;
     padding: 0;
+    z-index: 1000;
 }
 
 pre:not(.hljs) {
diff --git a/apps/client/src/widgets/dialogs/popup_editor.ts b/apps/client/src/widgets/dialogs/popup_editor.ts
index 86d6c4119..be1ca9243 100644
--- a/apps/client/src/widgets/dialogs/popup_editor.ts
+++ b/apps/client/src/widgets/dialogs/popup_editor.ts
@@ -96,7 +96,9 @@ export default class PopupEditorDialog extends Container<BasicWidget> {
 
     async openInPopupEvent({ noteIdOrPath }: EventData<"openInPopup">) {
         if (await this.refresh(noteIdOrPath)) {
-            const $dialog = await openDialog(this.$widget);
+            const $dialog = await openDialog(this.$widget, false, {
+                focus: false
+            });
             $dialog.on("shown.bs.modal", () => {
                 // Reduce the z-index of modals so that ckeditor popups are properly shown on top of it.
                 // The backdrop instance is not shared so it's OK to make a one-off modification.