diff --git a/shared/editor/nodes/Table.ts b/shared/editor/nodes/Table.ts
index 973f81816..9a4e2c664 100644
--- a/shared/editor/nodes/Table.ts
+++ b/shared/editor/nodes/Table.ts
@@ -171,11 +171,17 @@ export default class Table extends Node {
 
               if (shadowRight) {
                 decorations.push(
-                  Decoration.widget(pos + 1, () => {
-                    const shadow = document.createElement("div");
-                    shadow.className = "scrollable-shadow right";
-                    return shadow;
-                  })
+                  Decoration.widget(
+                    pos + 1,
+                    () => {
+                      const shadow = document.createElement("div");
+                      shadow.className = "scrollable-shadow right";
+                      return shadow;
+                    },
+                    {
+                      key: "table-shadow-right",
+                    }
+                  )
                 );
               }
               index++;
diff --git a/shared/editor/plugins/BlockMenuTrigger.tsx b/shared/editor/plugins/BlockMenuTrigger.tsx
index d982ad3fd..88df5dfe5 100644
--- a/shared/editor/plugins/BlockMenuTrigger.tsx
+++ b/shared/editor/plugins/BlockMenuTrigger.tsx
@@ -124,12 +124,18 @@ export default class BlockMenuTrigger extends Extension {
             if (isTopLevel) {
               if (isEmpty) {
                 decorations.push(
-                  Decoration.widget(parent.pos, () => {
-                    button.addEventListener("click", () => {
-                      this.editor.events.emit(EventType.blockMenuOpen, "");
-                    });
-                    return button;
-                  })
+                  Decoration.widget(
+                    parent.pos,
+                    () => {
+                      button.addEventListener("click", () => {
+                        this.editor.events.emit(EventType.blockMenuOpen, "");
+                      });
+                      return button;
+                    },
+                    {
+                      key: "block-trigger",
+                    }
+                  )
                 );
 
                 decorations.push(