diff --git a/packages/ui/src/tooltips.ts b/packages/ui/src/tooltips.ts
index f77b367cdf..c87e938ad9 100644
--- a/packages/ui/src/tooltips.ts
+++ b/packages/ui/src/tooltips.ts
@@ -42,6 +42,7 @@ export function tooltip (node: HTMLElement, options?: LabelAndProps): any {
   return {
     update (options: LabelAndProps) {
       opt = options
+      if (node !== storedValue.element) return
       const shown = !!(storedValue.label !== undefined || storedValue.component !== undefined)
       if (shown) {
         showTooltip(opt.label, node, opt.direction, opt.component, opt.props, opt.anchor, opt.onUpdate, opt.kind)
diff --git a/plugins/tracker-resources/src/components/issues/IssuesHeader.svelte b/plugins/tracker-resources/src/components/issues/IssuesHeader.svelte
index e15150b23e..7e0a3584e1 100644
--- a/plugins/tracker-resources/src/components/issues/IssuesHeader.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssuesHeader.svelte
@@ -36,6 +36,7 @@
       size={'small'}
       on:select={(result) => {
         if (result.detail !== undefined) {
+          if (viewlet?._id === result.detail.id) return
           viewlet = viewlets.find((vl) => vl._id === result.detail.id)
           if (viewlet) setActiveViewletId(viewlet._id)
         }