diff --git a/packages/core/src/extensions/TableHandles/TableHandles.ts b/packages/core/src/extensions/TableHandles/TableHandles.ts
index 8072cf7973..30637742d5 100644
--- a/packages/core/src/extensions/TableHandles/TableHandles.ts
+++ b/packages/core/src/extensions/TableHandles/TableHandles.ts
@@ -296,9 +296,13 @@ export class TableHandlesView implements PluginView {
         event.clientX >= tableRect.right - 1 &&
         event.clientX < tableRect.right + 20;
 
-      // without this check, we'd also hide draghandles when hovering over them
       const hideHandles =
-        event.clientX > tableRect.right || event.clientY > tableRect.bottom;
+        // always hide handles when the actively hovered table changed
+        this.state?.block.id !== tableBlock.id ||
+        // make sure we don't hide existing handles (keep col / row index) when
+        // we're hovering just above or to the right of a table
+        event.clientX > tableRect.right ||
+        event.clientY > tableRect.bottom;
 
       this.state = {
         ...this.state!,