diff --git a/code/core/src/manager/components/sidebar/Tree.tsx b/code/core/src/manager/components/sidebar/Tree.tsx
index 49110a95a72..da9267f6caa 100644
--- a/code/core/src/manager/components/sidebar/Tree.tsx
+++ b/code/core/src/manager/components/sidebar/Tree.tsx
@@ -211,9 +211,10 @@ const Node = React.memo<NodeProps>(function Node({
         {icon ? (
           <WithTooltip
             closeOnOutsideClick
+            closeOnTriggerHidden
             onClick={(event) => event.stopPropagation()}
             placement="bottom"
-            tooltip={() => (
+            tooltip={({ onHide }) => (
               <TooltipLinkList
                 links={Object.entries(status || {})
                   .sort(
@@ -234,6 +235,7 @@ const Node = React.memo<NodeProps>(function Node({
                     onClick: () => {
                       onSelectStoryId(item.id);
                       value.onClick?.();
+                      onHide();
                     },
                   }))}
               />