diff --git a/packages/core/src/extensions/Comments/CommentsPlugin.ts b/packages/core/src/extensions/Comments/CommentsPlugin.ts
index a5d1e24b6d..a62dc8a489 100644
--- a/packages/core/src/extensions/Comments/CommentsPlugin.ts
+++ b/packages/core/src/extensions/Comments/CommentsPlugin.ts
@@ -245,7 +245,7 @@ export class CommentsPlugin extends BlockNoteExtension {
             );
 
             const threadId = commentMark?.attrs.threadId as string | undefined;
-            self.selectThread(threadId, false);
+            self.selectThread(threadId);
           },
         },
       }),
@@ -268,7 +268,7 @@ export class CommentsPlugin extends BlockNoteExtension {
   /**
    * Set the selected thread
    */
-  public selectThread(threadId: string | undefined, scrollToThread = true) {
+  public selectThread(threadId: string | undefined) {
     if (this.selectedThreadId === threadId) {
       return;
     }
@@ -280,7 +280,7 @@ export class CommentsPlugin extends BlockNoteExtension {
       }),
     );
 
-    if (threadId && scrollToThread) {
+    if (threadId) {
       const selectedThreadPosition = this.threadPositions.get(threadId);
 
       if (!selectedThreadPosition) {
diff --git a/packages/mantine/src/comments/Card.tsx b/packages/mantine/src/comments/Card.tsx
index 544aed1135..7a9c563ff3 100644
--- a/packages/mantine/src/comments/Card.tsx
+++ b/packages/mantine/src/comments/Card.tsx
@@ -1,11 +1,11 @@
 import { assertEmpty, mergeCSSClasses } from "@blocknote/core";
-import { ComponentProps, mergeRefs } from "@blocknote/react";
+import { ComponentProps } from "@blocknote/react";
 import {
   Card as MantineCard,
   Divider as MantineDivider,
   Text as MantineText,
 } from "@mantine/core";
-import { forwardRef, useEffect, useRef } from "react";
+import { forwardRef } from "react";
 
 export const Card = forwardRef<
   HTMLDivElement,
@@ -24,24 +24,13 @@ export const Card = forwardRef<
 
   assertEmpty(rest, false);
 
-  // Makes the card scroll into view when selected.
-  const scrollRef = useRef<HTMLDivElement>(null);
-  useEffect(() => {
-    if (selected) {
-      scrollRef.current?.scrollIntoView({
-        behavior: "smooth",
-        block: "center",
-      });
-    }
-  }, [selected]);
-
   return (
     <MantineCard
       className={mergeCSSClasses(className, selected ? "selected" : "")}
       onFocus={onFocus}
       onBlur={onBlur}
       tabIndex={tabIndex}
-      ref={mergeRefs([ref, scrollRef])}
+      ref={ref}
     >
       {headerText && (
         <MantineText className={"bn-header-text"}>{headerText}</MantineText>
diff --git a/packages/react/src/components/Comments/FloatingThreadController.tsx b/packages/react/src/components/Comments/FloatingThreadController.tsx
index fc2bed356f..3df05ef6b0 100644
--- a/packages/react/src/components/Comments/FloatingThreadController.tsx
+++ b/packages/react/src/components/Comments/FloatingThreadController.tsx
@@ -6,7 +6,13 @@ import {
   InlineContentSchema,
   StyleSchema,
 } from "@blocknote/core";
-import { UseFloatingOptions, flip, offset, shift } from "@floating-ui/react";
+import {
+  UseFloatingOptions,
+  autoUpdate,
+  flip,
+  offset,
+  shift,
+} from "@floating-ui/react";
 import {
   ComponentProps,
   FC,
@@ -55,6 +61,7 @@ export const FloatingThreadController = <
           editor.focus();
         }
       },
+      whileElementsMounted: autoUpdate,
       ...props.floatingOptions,
     });