diff --git a/new-lamassu-admin/src/components/Tooltip.js b/new-lamassu-admin/src/components/Tooltip.js
index 40c85c36..8b56d6ff 100644
--- a/new-lamassu-admin/src/components/Tooltip.js
+++ b/new-lamassu-admin/src/components/Tooltip.js
@@ -90,30 +90,29 @@ const HoverableTooltip = memo(({ parentElements, children, width }) => {
   const handler = usePopperHandler(width)
 
   return (
-    <div>
-      {!R.isNil(parentElements) && (
-        <div
-          onMouseEnter={handler.handleOpenHelpPopper}
-          onMouseLeave={handler.handleCloseHelpPopper}>
-          {parentElements}
-        </div>
-      )}
-      {R.isNil(parentElements) && (
-        <button
-          type="button"
-          onMouseEnter={handler.handleOpenHelpPopper}
-          onMouseLeave={handler.handleCloseHelpPopper}
-          className={handler.classes.transparentButton}>
-          <HelpIcon />
-        </button>
-      )}
-      <Popper
-        open={handler.helpPopperOpen}
-        anchorEl={handler.helpPopperAnchorEl}
-        placement="bottom">
-        <div className={handler.classes.popoverContent}>{children}</div>
-      </Popper>
-    </div>
+    <ClickAwayListener onClickAway={handler.handleCloseHelpPopper}>
+      <div>
+        {!R.isNil(parentElements) && (
+          <div onMouseEnter={handler.handleOpenHelpPopper}>
+            {parentElements}
+          </div>
+        )}
+        {R.isNil(parentElements) && (
+          <button
+            type="button"
+            onMouseEnter={handler.handleOpenHelpPopper}
+            className={handler.classes.transparentButton}>
+            <HelpIcon />
+          </button>
+        )}
+        <Popper
+          open={handler.helpPopperOpen}
+          anchorEl={handler.helpPopperAnchorEl}
+          placement="bottom">
+          <div className={handler.classes.popoverContent}>{children}</div>
+        </Popper>
+      </div>
+    </ClickAwayListener>
   )
 })