diff --git a/lib/reactotron-core-ui/src/components/ActionButton/index.tsx b/lib/reactotron-core-ui/src/components/ActionButton/index.tsx
index 9731627e5..8bf5f9581 100644
--- a/lib/reactotron-core-ui/src/components/ActionButton/index.tsx
+++ b/lib/reactotron-core-ui/src/components/ActionButton/index.tsx
@@ -17,10 +17,12 @@ interface Props {
 }
 
 function ActionButton({ icon: Icon, tip, tipProps = {}, onClick }: Props) {
+  const tooltipId = tipProps.id || "tooltip-default"
+
   return (
-    <Container data-tip={tip} onClick={onClick}>
+    <Container data-tip={tip} data-for={tooltipId} onClick={onClick}>
       <Icon size={24} />
-      <Tooltip {...tipProps} />
+      <Tooltip {...tipProps} id={tooltipId} />
     </Container>
   )
 }
diff --git a/lib/reactotron-core-ui/src/components/Header/index.tsx b/lib/reactotron-core-ui/src/components/Header/index.tsx
index 743e70624..f8d87e365 100644
--- a/lib/reactotron-core-ui/src/components/Header/index.tsx
+++ b/lib/reactotron-core-ui/src/components/Header/index.tsx
@@ -98,6 +98,7 @@ const Header: FunctionComponent<React.PropsWithChildren<HeaderComponentProps>> =
               <ActionButton
                 tip={a.tip}
                 tipProps={{
+                  id: `tip-${idx}`,
                   effect: "float",
                 }}
                 icon={a.icon}