diff --git a/package.json b/package.json
index 1525f3c05..0f782f5bb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sanity/ui",
-  "version": "2.3.5",
+  "version": "2.3.6-0",
   "keywords": [
     "sanity",
     "ui",
diff --git a/src/core/primitives/tooltip/tooltip.tsx b/src/core/primitives/tooltip/tooltip.tsx
index 1bf4e8833..e6c1ff722 100644
--- a/src/core/primitives/tooltip/tooltip.tsx
+++ b/src/core/primitives/tooltip/tooltip.tsx
@@ -357,6 +357,10 @@ export const Tooltip = forwardRef(function Tooltip(
   )
 
   const childRef = useRef<HTMLElement | null>(null)
+
+  // Merge refs so that any ref we are overriding is called as well
+  useImperativeHandle((childProp as any)?.ref, () => childRef.current)
+
   const child = useMemo(() => {
     if (!childProp) return null