diff --git a/app/client/ui/tooltips.ts b/app/client/ui/tooltips.ts
index 79f74bee..850c5b02 100644
--- a/app/client/ui/tooltips.ts
+++ b/app/client/ui/tooltips.ts
@@ -174,6 +174,9 @@ export function setHoverTooltip(refElem: Element, tipContent: ITooltipContentFun
     // If request, re-open on click.
     dom.onElem(refElem, 'click', () => { close(); open(); });
   }
+
+  // close tooltip if refElem is disposed
+  dom.onDisposeElem(refElem, close);
 }
 
 /**