diff --git a/packages/bits-ui/src/lib/bits/tooltip/tooltip.svelte.ts b/packages/bits-ui/src/lib/bits/tooltip/tooltip.svelte.ts
index d8d61a700..60cf39d20 100644
--- a/packages/bits-ui/src/lib/bits/tooltip/tooltip.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/tooltip/tooltip.svelte.ts
@@ -289,6 +289,7 @@ class TooltipContentState {
 		this.#id = props.id;
 		const contentNode = useNodeById(this.#id);
 		this.root.contentNode = contentNode;
+		this.root.contentId = this.#id;
 		$effect(() => {
 			console.log(contentNode.value);
 		});
diff --git a/packages/bits-ui/src/lib/internal/useGraceArea.svelte.ts b/packages/bits-ui/src/lib/internal/useGraceArea.svelte.ts
index 7e5e60879..e55b4768c 100644
--- a/packages/bits-ui/src/lib/internal/useGraceArea.svelte.ts
+++ b/packages/bits-ui/src/lib/internal/useGraceArea.svelte.ts
@@ -38,29 +38,25 @@ export function useGraceArea(triggerId: ReadableBox<string>, contentId: Readable
 	}
 
 	$effect(() => {
-		const tNode = triggerNode;
-		let cNode = contentNode;
-		if (!tNode) return;
-		if (!cNode) {
-			cNode = document.getElementById(contentId.value);
-			if (!cNode) return;
-			contentNode = cNode;
-		}
+		contentNode = document.getElementById(contentId.value);
+		if (!triggerNode || !contentNode) return;
 
-		if (!triggerNode || !cNode) return;
-		const handleTriggerLeave = (e: PointerEvent) => handleCreateGraceArea(e, cNode!);
-		const handleContentLeave = () => handleRemoveGraceArea();
+		const handleTriggerLeave = (e: PointerEvent) => {
+			handleCreateGraceArea(e, contentNode!);
+		};
 
-		const unsub = executeCallbacks(
+		const handleContentLeave = (e: PointerEvent) => {
+			handleCreateGraceArea(e, triggerNode!);
+		};
+		return executeCallbacks(
 			addEventListener(triggerNode, "pointerleave", handleTriggerLeave),
-			addEventListener(cNode, "pointerleave", handleContentLeave)
+			addEventListener(contentNode, "pointerleave", handleContentLeave)
 		);
-
-		return unsub;
 	});
 
 	$effect(() => {
 		if (!pointerGraceArea) return;
+
 		function handleTrackPointerGrace(e: PointerEvent) {
 			if (!pointerGraceArea) return;
 			const target = e.target;
@@ -77,9 +73,7 @@ export function useGraceArea(triggerId: ReadableBox<string>, contentId: Readable
 			}
 		}
 
-		const unsub = addEventListener(document, "pointermove", handleTrackPointerGrace);
-
-		return unsub;
+		return addEventListener(document, "pointermove", handleTrackPointerGrace);
 	});
 
 	return {