diff --git a/packages/grafana-ui/src/components/ClickOutsideWrapper/ClickOutsideWrapper.tsx b/packages/grafana-ui/src/components/ClickOutsideWrapper/ClickOutsideWrapper.tsx
index 5b4e8ca0cb4..a57535037f2 100644
--- a/packages/grafana-ui/src/components/ClickOutsideWrapper/ClickOutsideWrapper.tsx
+++ b/packages/grafana-ui/src/components/ClickOutsideWrapper/ClickOutsideWrapper.tsx
@@ -25,17 +25,16 @@ export class ClickOutsideWrapper extends PureComponent<Props, State> {
   };
 
   componentDidMount() {
-    document.addEventListener('click', this.onOutsideClick, false);
+    document.addEventListener('mousedown', this.onOutsideClick, false);
     if (this.props.includeButtonPress) {
-      // Use keyup since keydown already has an eventlistener on window
-      document.addEventListener('keyup', this.onOutsideClick, false);
+      document.addEventListener('keydown', this.onOutsideClick, false);
     }
   }
 
   componentWillUnmount() {
-    document.removeEventListener('click', this.onOutsideClick, false);
+    document.removeEventListener('mousedown', this.onOutsideClick, false);
     if (this.props.includeButtonPress) {
-      document.removeEventListener('keyup', this.onOutsideClick, false);
+      document.removeEventListener('keydown', this.onOutsideClick, false);
     }
   }