diff --git a/src/toolbar/ToolbarButtonPopup.tsx b/src/toolbar/ToolbarButtonPopup.tsx
index 3e0dc2a5a..617e0ed87 100644
--- a/src/toolbar/ToolbarButtonPopup.tsx
+++ b/src/toolbar/ToolbarButtonPopup.tsx
@@ -6,7 +6,8 @@ import type {ToolbarBaseProps, ToolbarButtonPopupData} from './types';
 export type ToolbarButtonPopupProps<E> = ToolbarBaseProps<E> & ToolbarButtonPopupData<E>;
 
 export function ToolbarButtonPopup<E>(props: ToolbarButtonPopupProps<E>) {
-    const {className, editor, isActive, isEnable, renderPopup, ...buttonProps} = props;
+    const {className, editor, isActive, isEnable, renderPopup, disableTooltip, ...buttonProps} =
+        props;
 
     const [anchorElement, setAnchorElement] = useElementState();
     const [isOpen, , close, toggle] = useBooleanState(false);
@@ -23,6 +24,7 @@ export function ToolbarButtonPopup<E>(props: ToolbarButtonPopupProps<E>) {
                 enabled={enabled}
                 className={className}
                 onClick={toggle}
+                disableTooltip={disableTooltip || isOpen}
             />
             {isOpen &&
                 renderPopup({
diff --git a/src/toolbar/ToolbarListButton.tsx b/src/toolbar/ToolbarListButton.tsx
index d84aa23be..770a2d6f1 100644
--- a/src/toolbar/ToolbarListButton.tsx
+++ b/src/toolbar/ToolbarListButton.tsx
@@ -90,7 +90,7 @@ export function ToolbarListButton<E>({
                     if (popupItem) setPopupItem(undefined);
                     else toggleOpen();
                 }}
-                disableTooltip={disableTooltip}
+                disableTooltip={disableTooltip || popupOpen}
             >
                 {buttonContent}
             </ToolbarButtonView>