diff --git a/app/src/protyle/render/av/action.ts b/app/src/protyle/render/av/action.ts
index 1ba8180ea..3ee4d59ba 100644
--- a/app/src/protyle/render/av/action.ts
+++ b/app/src/protyle/render/av/action.ts
@@ -300,7 +300,10 @@ export const avContextmenu = (protyle: IProtyle, rowElement: HTMLElement, positi
     if (!blockElement) {
         return false;
     }
-    clearSelect(["cell", "row"], blockElement);
+    if (!rowElement.classList.contains("av__row--select")) {
+        clearSelect(["row"], blockElement);
+    }
+    clearSelect(["cell"], blockElement);
     const menu = new Menu();
     rowElement.classList.add("av__row--select");
     rowElement.querySelector(".av__firstcol use").setAttribute("xlink:href", "#iconCheck");
diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts
index bad421417..b1b0b5c33 100644
--- a/app/src/protyle/wysiwyg/index.ts
+++ b/app/src/protyle/wysiwyg/index.ts
@@ -629,7 +629,7 @@ export class WYSIWYG {
             hideElements(["select"], protyle);
             if (hasClosestByAttribute(target, "data-type", "av-gallery-more")) {
                 clearSelect(["img", "row", "cell"], protyle.wysiwyg.element);
-            } else {
+            } else if (!hasClosestByClassName(target, "av__firstcol")) {
                 clearSelect(["img", "av"], protyle.wysiwyg.element);
             }