diff --git a/eslint.config.mjs b/eslint.config.mjs
index 35c5cdbca3..3a9f679020 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -46,6 +46,8 @@ export default [
       '**/commitlint.config.js',
       // E2E tests
       'e2e-tests/**',
+      // SDK scripts — ESM parsed incorrectly by typescript-eslint
+      'packages/sdk/scripts/**',
     ],
   },
   {
diff --git a/packages/superdoc/src/SuperDoc.vue b/packages/superdoc/src/SuperDoc.vue
index 48951fc900..6b1b7cf6c7 100644
--- a/packages/superdoc/src/SuperDoc.vue
+++ b/packages/superdoc/src/SuperDoc.vue
@@ -956,11 +956,13 @@ watch(
   },
 );
 
+// Ensure hasInitializedLocations is set when comments arrive (backup for cases
+// where handleDocumentReady hasn't fired yet). Never toggle false→true→false —
+// the virtualized FloatingComments reacts to comment changes via computed properties.
 watch(getFloatingComments, () => {
-  hasInitializedLocations.value = false;
-  nextTick(() => {
+  if (!hasInitializedLocations.value) {
     hasInitializedLocations.value = true;
-  });
+  }
 });
 
 const {
diff --git a/packages/superdoc/src/components/CommentsLayer/FloatingComments.vue b/packages/superdoc/src/components/CommentsLayer/FloatingComments.vue
index 481c3626d1..a55a10cd5c 100644
--- a/packages/superdoc/src/components/CommentsLayer/FloatingComments.vue
+++ b/packages/superdoc/src/components/CommentsLayer/FloatingComments.vue
@@ -1,10 +1,18 @@
+<script>
+// Module-level cache — survives component remounts caused by hasInitializedLocations toggle
+const _heightsCache = {};
+</script>
+
 <script setup>
 import { storeToRefs } from 'pinia';
-import { ref, computed, watchEffect, nextTick, watch, onMounted, onBeforeUnmount } from 'vue';
+import { ref, computed, nextTick, watch, onMounted, onBeforeUnmount } from 'vue';
 import { useCommentsStore } from '@superdoc/stores/comments-store';
 import { useSuperdocStore } from '@superdoc/stores/superdoc-store';
 import CommentDialog from '@superdoc/components/CommentsLayer/CommentDialog.vue';
 
+const ESTIMATED_HEIGHT = 80;
+const OBSERVER_MARGIN = 600;
+
 const props = defineProps({
   currentDocument: {
     type: Object,
@@ -19,182 +27,244 @@ const props = defineProps({
 const superdocStore = useSuperdocStore();
 const commentsStore = useCommentsStore();
 
-const { getFloatingComments, hasInitializedLocations, activeComment, commentsList, editorCommentPositions } =
-  storeToRefs(commentsStore);
+const { getFloatingComments, activeComment, editorCommentPositions } = storeToRefs(commentsStore);
 const { activeZoom } = storeToRefs(superdocStore);
 
 const floatingCommentsContainer = ref(null);
-const renderedSizes = ref([]);
-const firstGroupRendered = ref(false);
-const verticalOffset = ref(0);
 const commentsRenderKey = ref(0);
-const measurementTimeoutId = ref(null);
 
-const getCommentPosition = computed(() => (comment) => {
-  if (!floatingCommentsContainer.value) return { top: '0px' };
-  if (typeof comment.top !== 'number' || isNaN(comment.top)) {
-    return { display: 'none' };
-  }
-  return { top: `${comment.top}px` };
+// Resolve activeComment (which stores commentId) to the position key used by allPositions
+// (which prefers importedId). Without this, imported Word comments where importedId !== commentId
+// would fail the template guard and could unmount when scrolled out of the observer viewport.
+const activeCommentKey = computed(() => {
+  if (!activeComment.value) return null;
+  const comment = commentsStore.getComment(activeComment.value);
+  return comment ? commentsStore.getCommentPositionKey(comment) : null;
 });
 
-const handleDialog = (dialog) => {
-  if (!dialog) return;
-  const { elementRef, commentId } = dialog;
-  if (!elementRef) return;
+// Heights: measured (actual) or estimated. Seeded from module-level cache to
+// survive remounts triggered by hasInitializedLocations toggle in SuperDoc.vue.
+const measuredHeights = ref({ ..._heightsCache });
 
-  nextTick(() => {
-    const id = commentId;
-    if (renderedSizes.value.some((item) => item.id == id)) return;
-
-    const comment = getFloatingComments.value.find((c) => c.commentId === id || c.importedId == id);
-    const positionKey = id || comment?.importedId;
-    const positionEntry = editorCommentPositions.value[positionKey];
-    const position = positionEntry?.bounds || {};
-
-    // If this is a PDF, set the position based on selection bounds
-    if (props.currentDocument.type === 'application/pdf') {
-      const zoom = (activeZoom.value ?? 100) / 100;
-      Object.entries(comment.selection?.selectionBounds).forEach(([key, value]) => {
-        position[key] = Number(value) * zoom;
-      });
-    }
+// Set of comment IDs that are near the viewport (should mount CommentDialog)
+const visibleIds = ref(new Set());
 
-    if (!position) return;
+// Refs for placeholder elements keyed by comment ID
+const placeholderRefs = ref({});
 
-    const bounds = elementRef.value?.getBoundingClientRect();
-    const top = Number(position.top);
-    if (!Number.isFinite(top)) return;
-    const placement = {
-      id,
+let observer = null;
+
+// Compute anchor position for a comment from editor position data
+const getAnchorTop = (comment) => {
+  const key = commentsStore.getCommentPositionKey(comment);
+  const positionEntry = editorCommentPositions.value[key];
+
+  if (props.currentDocument.type === 'application/pdf') {
+    const zoom = (activeZoom.value ?? 100) / 100;
+    return Number(comment.selection?.selectionBounds?.top) * zoom;
+  }
+
+  return positionEntry?.bounds?.top;
+};
+
+// Pre-compute all positions with collision avoidance
+const allPositions = computed(() => {
+  const comments = getFloatingComments.value;
+  if (!comments.length) return [];
+
+  const positions = [];
+  for (const comment of comments) {
+    const key = commentsStore.getCommentPositionKey(comment);
+    const top = getAnchorTop(comment);
+    if (!key || typeof top !== 'number' || isNaN(top)) continue;
+
+    const positionEntry = editorCommentPositions.value[key];
+    positions.push({
+      id: key,
+      anchorTop: top,
       top,
-      height: bounds.height,
+      height: measuredHeights.value[key] || ESTIMATED_HEIGHT,
       commentRef: comment,
-      elementRef,
       pageIndex: positionEntry?.pageIndex ?? 0,
-    };
-    renderedSizes.value.push(placement);
-  });
-};
+    });
+  }
 
-const processLocations = async () => {
-  const groupedByPage = renderedSizes.value.reduce((acc, comment) => {
-    const key = comment.pageIndex ?? 0;
-    if (!acc[key]) acc[key] = [];
-    acc[key].push(comment);
-    return acc;
-  }, {});
-
-  Object.values(groupedByPage).forEach((comments) => {
-    comments
-      .sort((a, b) => a.top - b.top)
-      .forEach((comment, idx, arr) => {
-        if (idx === 0) return;
-        const prev = arr[idx - 1];
-        const minTop = prev.top + prev.height + 15;
-        if (comment.top < minTop) {
-          comment.top = minTop;
-        }
-      });
-  });
+  // Collision avoidance: push overlapping comments down (per page)
+  const groupedByPage = {};
+  for (const pos of positions) {
+    const key = pos.pageIndex;
+    if (!groupedByPage[key]) groupedByPage[key] = [];
+    groupedByPage[key].push(pos);
+  }
 
-  await nextTick();
-  firstGroupRendered.value = true;
-};
+  for (const pageComments of Object.values(groupedByPage)) {
+    pageComments.sort((a, b) => a.top - b.top);
+    for (let i = 1; i < pageComments.length; i++) {
+      const prev = pageComments[i - 1];
+      const minTop = prev.top + prev.height + 15;
+      if (pageComments[i].top < minTop) {
+        pageComments[i].top = minTop;
+      }
+    }
+  }
+
+  return positions;
+});
 
-// Ensures floating comments update after all are measured
-// Falls back to rendering what we have after a timeout if some comments fail to get positions
-watchEffect(() => {
-  // Clear any pending timeout
-  if (measurementTimeoutId.value) {
-    clearTimeout(measurementTimeoutId.value);
-    measurementTimeoutId.value = null;
+// Total height so the sidebar container gets proper scroll height
+const totalHeight = computed(() => {
+  if (!allPositions.value.length) return 0;
+  let max = 0;
+  for (const p of allPositions.value) {
+    const bottom = p.top + p.height;
+    if (bottom > max) max = bottom;
   }
+  return max + 50;
+});
 
-  const totalComments = getFloatingComments.value.length;
-  const measuredComments = renderedSizes.value.length;
+// Set up IntersectionObserver to track which placeholders are near the viewport
+const setupObserver = () => {
+  if (observer) observer.disconnect();
 
-  if (totalComments === 0 || measuredComments === 0) {
-    return;
+  observer = new IntersectionObserver(
+    (entries) => {
+      const newVisible = new Set(visibleIds.value);
+      for (const entry of entries) {
+        const id = entry.target.dataset.commentId;
+        if (!id) continue;
+        if (entry.isIntersecting) {
+          newVisible.add(id);
+        } else {
+          newVisible.delete(id);
+        }
+      }
+      visibleIds.value = newVisible;
+    },
+    {
+      rootMargin: `${OBSERVER_MARGIN}px 0px ${OBSERVER_MARGIN}px 0px`,
+    },
+  );
+};
+
+// Observe/unobserve placeholder elements when positions change
+const observePlaceholders = () => {
+  if (!observer) return;
+  observer.disconnect();
+
+  for (const pos of allPositions.value) {
+    const el = placeholderRefs.value[pos.id];
+    if (el) observer.observe(el);
   }
+};
 
-  nextTick(processLocations);
-});
+// When a CommentDialog mounts and reports its size, record the measured height.
+// CommentDialog emits importedId when defined (prefers importedId), but allPositions
+// keys by getCommentPositionKey (also prefers importedId). We normalize here to match.
+const handleDialog = (dialog) => {
+  if (!dialog) return;
+  const { elementRef, commentId: rawId } = dialog;
+  if (!elementRef) return;
 
-watch(activeComment, (newVal, oldVal) => {
   nextTick(() => {
-    if (!activeComment.value) return (verticalOffset.value = 0);
-
-    const comment = commentsStore.getComment(activeComment.value);
-    if (!comment) return (verticalOffset.value = 0);
-    const commentKey = comment.commentId || comment.importedId;
-    const renderedItem = renderedSizes.value.find((item) => item.id === commentKey);
-    if (!renderedItem) return (verticalOffset.value = 0);
-
-    const selectionTop = comment.selection.selectionBounds.top;
-    const zoom = props.currentDocument.type === 'application/pdf' ? (activeZoom.value ?? 100) / 100 : 1;
-    const renderedTop = renderedItem.top;
-
-    const editorBounds = floatingCommentsContainer.value.getBoundingClientRect();
-    verticalOffset.value = selectionTop * zoom - renderedTop;
-
-    setTimeout(() => {
-      renderedItem.elementRef?.value?.scrollIntoView({
-        behavior: 'smooth',
-        block: 'center',
-      });
-    }, 200);
+    const bounds = elementRef.value?.getBoundingClientRect();
+    if (!bounds || bounds.height <= 0) return;
+
+    // Normalize to canonical key (matches allPositions)
+    const key = commentsStore.getCommentPositionKey(rawId);
+    if (!key) return;
+
+    const current = measuredHeights.value[key];
+    if (current !== bounds.height) {
+      _heightsCache[key] = bounds.height;
+      measuredHeights.value = { ...measuredHeights.value, [key]: bounds.height };
+    }
   });
+};
+
+// Store placeholder ref by comment ID
+const setPlaceholderRef = (id, el) => {
+  if (el) {
+    placeholderRefs.value[id] = el;
+    if (observer) observer.observe(el);
+  } else {
+    delete placeholderRefs.value[id];
+  }
+};
+
+// Reactive vertical offset — stays in sync as allPositions recomputes from height measurements
+const verticalOffset = computed(() => {
+  if (!activeComment.value) return 0;
+  const comment = commentsStore.getComment(activeComment.value);
+  if (!comment) return 0;
+  const key = commentsStore.getCommentPositionKey(comment);
+  const position = allPositions.value.find((p) => p.id === key);
+  if (!position) return 0;
+  return position.anchorTop - position.top;
 });
 
+// Scroll active comment into view when it changes
+watch(activeComment, () => {
+  if (!activeComment.value) return;
+  const comment = commentsStore.getComment(activeComment.value);
+  if (!comment) return;
+  const key = commentsStore.getCommentPositionKey(comment);
+
+  setTimeout(() => {
+    const el = placeholderRefs.value[key];
+    el?.scrollIntoView({ behavior: 'smooth', block: 'center' });
+  }, 200);
+});
+
+// PDF zoom change: reset measurements
 watch(activeZoom, () => {
   if (props.currentDocument.type === 'application/pdf') {
-    renderedSizes.value = [];
-    firstGroupRendered.value = false;
+    for (const k in _heightsCache) delete _heightsCache[k];
+    measuredHeights.value = {};
     commentsRenderKey.value += 1;
-    verticalOffset.value = 0;
   }
 });
 
+// Re-observe when positions change
+watch(allPositions, () => {
+  nextTick(observePlaceholders);
+});
+
+onMounted(() => {
+  setupObserver();
+  nextTick(observePlaceholders);
+});
+
 onBeforeUnmount(() => {
-  // Clean up pending timeout to prevent memory leak
-  if (measurementTimeoutId.value) {
-    clearTimeout(measurementTimeoutId.value);
-    measurementTimeoutId.value = null;
+  if (observer) {
+    observer.disconnect();
+    observer = null;
   }
+  // NOTE: Do NOT clear _heightsCache here. The module-level cache is designed to
+  // survive remounts caused by hasInitializedLocations toggle in SuperDoc.vue.
+  // Clearing it causes flickering because every remount starts with estimated heights.
 });
 </script>
 
 <template>
-  <div class="section-wrapper" ref="floatingCommentsContainer">
-    <!-- First group: Detecting heights -->
-    <div class="sidebar-container calculation-container">
-      <div v-for="comment in getFloatingComments" :key="comment.commentId || comment.importedId">
-        <div :id="comment.commentId || comment.importedId" class="measure-comment">
-          <CommentDialog
-            @ready="handleDialog"
-            :key="comment.commentId + commentsRenderKey"
-            class="floating-comment"
-            :parent="parent"
-            :comment="comment"
-          />
-        </div>
-      </div>
-    </div>
-
-    <!-- Second group: Render only after first group is processed -->
-    <div v-if="firstGroupRendered" class="sidebar-container" :style="{ top: verticalOffset + 'px' }">
+  <div class="section-wrapper" ref="floatingCommentsContainer" :style="{ minHeight: totalHeight + 'px' }">
+    <div class="sidebar-container" :style="{ top: verticalOffset + 'px' }">
+      <!-- Lightweight placeholders for ALL comments (observed for viewport proximity) -->
       <div
-        v-for="comment in renderedSizes"
-        :key="comment.id"
-        :style="getCommentPosition(comment)"
-        class="floating-comment"
+        v-for="pos in allPositions"
+        :key="pos.id"
+        :ref="(el) => setPlaceholderRef(pos.id, el)"
+        :data-comment-id="pos.id"
+        :style="{ top: pos.top + 'px', height: pos.height + 'px' }"
+        class="comment-placeholder"
       >
+        <!-- Only mount the heavy CommentDialog when near the viewport -->
         <CommentDialog
-          :key="comment.id + commentsRenderKey"
+          v-if="visibleIds.has(pos.id) || pos.id === activeCommentKey"
+          :key="pos.id + commentsRenderKey"
+          @ready="handleDialog"
           class="floating-comment"
           :parent="parent"
-          :comment="comment.commentRef"
+          :comment="pos.commentRef"
         />
       </div>
     </div>
@@ -202,19 +272,23 @@ onBeforeUnmount(() => {
 </template>
 
 <style scoped>
-.measure-comment {
-  box-sizing: border-box;
-  height: auto;
+.comment-placeholder {
+  position: absolute;
+  width: 300px;
 }
+
 .floating-comment {
-  position: absolute;
+  position: relative;
   display: block;
+  min-width: 300px;
 }
+
 .sidebar-container {
   position: absolute;
   width: 300px;
   min-height: 300px;
 }
+
 .section-wrapper {
   position: relative;
   min-height: 100%;
@@ -223,14 +297,4 @@ onBeforeUnmount(() => {
   align-items: flex-start;
   justify-content: flex-start;
 }
-.floating-comment {
-  position: absolute;
-  min-width: 300px;
-}
-.calculation-container {
-  visibility: hidden;
-  position: fixed;
-  left: -9999px;
-  top: -9999px;
-}
 </style>
diff --git a/packages/superdoc/src/stores/comments-store.js b/packages/superdoc/src/stores/comments-store.js
index 11b31c4e42..12bf42db82 100644
--- a/packages/superdoc/src/stores/comments-store.js
+++ b/packages/superdoc/src/stores/comments-store.js
@@ -781,6 +781,8 @@ export const useCommentsStore = defineStore('comments', () => {
         ...(formatMark && { formatMark: formatMark.mark }),
       };
 
+      // nodes/deletionNodes are unused here — the function resolves them from
+      // trackedChangesForId which already contains all document positions for this ID.
       const params = createOrUpdateTrackedChangeComment({
         event: 'add',
         marks,
@@ -1019,6 +1021,7 @@ export const useCommentsStore = defineStore('comments', () => {
     getGroupedComments,
     getCommentsByPosition,
     getFloatingComments,
+    getCommentPositionKey,
     getCommentPosition,
     getCommentAnchoredText,
     getCommentAnchorData,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d09cff61b9..6f18c06055 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -989,6 +989,22 @@ importers:
       typescript:
         specifier: 'catalog:'
         version: 5.9.3
+    optionalDependencies:
+      '@superdoc-dev/sdk-darwin-arm64':
+        specifier: 1.0.0-alpha.6
+        version: link:platforms/sdk-darwin-arm64
+      '@superdoc-dev/sdk-darwin-x64':
+        specifier: 1.0.0-alpha.6
+        version: link:platforms/sdk-darwin-x64
+      '@superdoc-dev/sdk-linux-arm64':
+        specifier: 1.0.0-alpha.6
+        version: link:platforms/sdk-linux-arm64
+      '@superdoc-dev/sdk-linux-x64':
+        specifier: 1.0.0-alpha.6
+        version: link:platforms/sdk-linux-x64
+      '@superdoc-dev/sdk-windows-x64':
+        specifier: 1.0.0-alpha.6
+        version: link:platforms/sdk-windows-x64
 
   packages/sdk/langs/node/platforms/sdk-darwin-arm64: {}
 
diff --git a/tests/behavior/tests/comments/basic-comment-insertion.spec.ts b/tests/behavior/tests/comments/basic-comment-insertion.spec.ts
index ff3688eb2e..43738a89de 100644
--- a/tests/behavior/tests/comments/basic-comment-insertion.spec.ts
+++ b/tests/behavior/tests/comments/basic-comment-insertion.spec.ts
@@ -95,9 +95,9 @@ test('add a comment via the UI bubble', async ({ superdoc }) => {
   }
 
   // Verify the comment text appears in the floating dialog
-  const commentDialog = superdoc.page.locator('.floating-comment > .comments-dialog').last();
+  const commentDialog = superdoc.page.locator('.comment-placeholder .comments-dialog').last();
   const commentText = commentDialog.locator('.comment-body .comment');
-  await expect(commentText.first()).toBeAttached({ timeout: 5_000 });
+  await expect(commentText.first()).toBeAttached({ timeout: 10_000 });
   await expect(commentText.first()).toContainText('UI comment on selected text');
 
   await superdoc.snapshot('comment added via UI');
diff --git a/tests/behavior/tests/comments/edit-comment-text.spec.ts b/tests/behavior/tests/comments/edit-comment-text.spec.ts
index 028d18de73..e83ae6da43 100644
--- a/tests/behavior/tests/comments/edit-comment-text.spec.ts
+++ b/tests/behavior/tests/comments/edit-comment-text.spec.ts
@@ -59,8 +59,10 @@ test('editing a comment updates its text', async ({ superdoc }) => {
   await superdoc.waitForStable();
 
   // After update the dialog loses is-active; verify the text changed via the visible sidebar dialog
-  const updatedDialog = superdoc.page.locator('.floating-comment > .comments-dialog');
-  await expect(updatedDialog.locator('.comment-body .comment').first()).toContainText('changed comment');
+  const updatedDialog = superdoc.page.locator('.comment-placeholder .comments-dialog');
+  await expect(updatedDialog.locator('.comment-body .comment').first()).toContainText('changed comment', {
+    timeout: 10_000,
+  });
   // CommentInfo.text is optional in the contract — some adapters don't populate it.
   // Verify via the API when available; the DOM assertion above covers all adapters.
   const listed = await listComments(superdoc.page, { includeResolved: true });
diff --git a/tests/behavior/tests/comments/floating-comments-virtualization.spec.ts b/tests/behavior/tests/comments/floating-comments-virtualization.spec.ts
new file mode 100644
index 0000000000..30b15798f2
--- /dev/null
+++ b/tests/behavior/tests/comments/floating-comments-virtualization.spec.ts
@@ -0,0 +1,66 @@
+import { test, expect } from '../../fixtures/superdoc.js';
+import { assertDocumentApiReady, listTrackChanges, listComments } from '../../helpers/document-api.js';
+
+test.use({ config: { toolbar: 'full', comments: 'on', trackChanges: true } });
+
+test('@behavior SD-1997: floating comment bubbles render after tracked changes', async ({ superdoc }) => {
+  await assertDocumentApiReady(superdoc.page);
+
+  // Switch to suggesting mode so edits create tracked changes
+  await superdoc.setDocumentMode('suggesting');
+  await superdoc.waitForStable();
+
+  // Create several tracked changes
+  for (let i = 0; i < 5; i++) {
+    await superdoc.type(`tracked change ${i + 1}`);
+    await superdoc.newLine();
+    await superdoc.waitForStable();
+  }
+
+  // Verify tracked changes were created
+  await expect
+    .poll(async () => (await listTrackChanges(superdoc.page, { type: 'insert' })).total)
+    .toBeGreaterThanOrEqual(5);
+
+  // Verify floating comment placeholders appear in the sidebar
+  const placeholders = superdoc.page.locator('.comment-placeholder');
+  await expect(placeholders.first()).toBeAttached({ timeout: 10_000 });
+
+  const count = await placeholders.count();
+  expect(count).toBeGreaterThanOrEqual(5);
+
+  // Verify at least one CommentDialog is mounted (visible near viewport)
+  const dialogs = superdoc.page.locator('.comment-placeholder .comments-dialog');
+  await expect(dialogs.first()).toBeAttached({ timeout: 10_000 });
+});
+
+test('@behavior SD-1997: typing does not flicker floating comments', async ({ superdoc }) => {
+  await assertDocumentApiReady(superdoc.page);
+
+  // Create a tracked change in suggesting mode
+  await superdoc.setDocumentMode('suggesting');
+  await superdoc.waitForStable();
+
+  await superdoc.type('initial tracked change');
+  await superdoc.waitForStable();
+
+  // Wait for the floating comment to appear
+  const placeholders = superdoc.page.locator('.comment-placeholder');
+  await expect(placeholders.first()).toBeAttached({ timeout: 10_000 });
+
+  const initialCount = await placeholders.count();
+  expect(initialCount).toBeGreaterThanOrEqual(1);
+
+  // Now type more text — placeholders should remain in the DOM (no flicker)
+  await superdoc.newLine();
+  await superdoc.type('more text here');
+
+  // Placeholders should still be attached without disappearing
+  await expect(placeholders.first()).toBeAttached();
+  const afterTypingCount = await placeholders.count();
+  expect(afterTypingCount).toBeGreaterThanOrEqual(initialCount);
+
+  // Verify the comment dialog content is still visible (not unmounted/remounted empty)
+  const dialog = superdoc.page.locator('.comment-placeholder .comments-dialog');
+  await expect(dialog.first()).toBeAttached({ timeout: 5_000 });
+});
diff --git a/tests/behavior/tests/comments/tracked-change-replacement-bubble.spec.ts b/tests/behavior/tests/comments/tracked-change-replacement-bubble.spec.ts
index a381624fa8..a31576c1d2 100644
--- a/tests/behavior/tests/comments/tracked-change-replacement-bubble.spec.ts
+++ b/tests/behavior/tests/comments/tracked-change-replacement-bubble.spec.ts
@@ -25,10 +25,10 @@ test('SD-1739 tracked change replacement does not duplicate text in bubble', asy
 
   // The floating dialog should show the tracked change with correct text
   // (Bug SD-1739 would show "Added: redliningg" with duplicated trailing char)
-  const dialog = superdoc.page.locator('.floating-comment > .comments-dialog', {
+  const dialog = superdoc.page.locator('.comment-placeholder .comments-dialog', {
     has: superdoc.page.locator('.tracked-change-text'),
   });
-  await expect(dialog).toBeVisible({ timeout: 5_000 });
+  await expect(dialog).toBeVisible({ timeout: 10_000 });
 
   // "Added:" label with "redlining" text — must NOT contain "redliningg"
   const addedText = dialog.locator('.tracked-change-text').first();