diff --git a/services/web/frontend/js/features/source-editor/components/toolbar/button-menu.tsx b/services/web/frontend/js/features/source-editor/components/toolbar/button-menu.tsx
index 484a1dfa84..55990c6d6b 100644
--- a/services/web/frontend/js/features/source-editor/components/toolbar/button-menu.tsx
+++ b/services/web/frontend/js/features/source-editor/components/toolbar/button-menu.tsx
@@ -69,6 +69,7 @@ export const ToolbarButtonMenu: FC<{
   return (
     <>
       <Tooltip
+        hidden={open}
         id={id}
         description={<div>{label}</div>}
         overlayProps={{ placement: 'bottom' }}
diff --git a/services/web/frontend/js/shared/components/tooltip.tsx b/services/web/frontend/js/shared/components/tooltip.tsx
index d0defbea23..b86e963c8b 100644
--- a/services/web/frontend/js/shared/components/tooltip.tsx
+++ b/services/web/frontend/js/shared/components/tooltip.tsx
@@ -15,6 +15,7 @@ export type TooltipProps = {
   id: string
   overlayProps?: OverlayProps
   tooltipProps?: BSTooltip.TooltipProps
+  hidden?: boolean
   children: React.ReactElement
 }
 
@@ -24,6 +25,7 @@ function Tooltip({
   children,
   tooltipProps,
   overlayProps,
+  hidden,
 }: TooltipProps) {
   const hideTooltip = (e: React.MouseEvent) => {
     if (e.currentTarget instanceof HTMLElement) {
@@ -34,7 +36,11 @@ function Tooltip({
   return (
     <OverlayTrigger
       overlay={
-        <BSTooltip id={`${id}-tooltip`} {...tooltipProps}>
+        <BSTooltip
+          id={`${id}-tooltip`}
+          {...tooltipProps}
+          style={{ display: hidden ? 'none' : 'block' }}
+        >
           {description}
         </BSTooltip>
       }