From 477df7aa7c576ebdf6b12ae9e616516f62b38bbe Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Wed, 23 Aug 2023 11:32:25 +0800
Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/9018

---
 app/src/block/popover.ts       | 4 ++++
 app/src/boot/globalShortcut.ts | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/block/popover.ts b/app/src/block/popover.ts
index 73444ca5e..8061be1de 100644
--- a/app/src/block/popover.ts
+++ b/app/src/block/popover.ts
@@ -52,6 +52,10 @@ export const initBlockPopover = (app: App) => {
             if (!getTarget(event, aElement)) {
                 return;
             }
+            // https://github.com/siyuan-note/siyuan/issues/9007
+            if (event.relatedTarget && !document.contains(event.relatedTarget as Node)) {
+                return;
+            }
             if (window.siyuan.ctrlIsPressed) {
                 clearTimeout(timeoutHide);
                 showPopover(app);
diff --git a/app/src/boot/globalShortcut.ts b/app/src/boot/globalShortcut.ts
index 9ee95317f..94c07720c 100644
--- a/app/src/boot/globalShortcut.ts
+++ b/app/src/boot/globalShortcut.ts
@@ -445,7 +445,8 @@ export const globalShortcut = (app: App) => {
         if (!event.altKey && !event.shiftKey && isCtrl(event)) {
             if (event.key === "Meta" || event.key === "Control" || event.ctrlKey || event.metaKey) {
                 window.siyuan.ctrlIsPressed = true;
-                if (window.siyuan.config.editor.floatWindowMode === 1 && !event.repeat) {
+                if ((event.key === "Meta" || event.key === "Control") &&
+                    window.siyuan.config.editor.floatWindowMode === 1 && !event.repeat) {
                     showPopover(app);
                 }
             } else {