diff --git a/packages/grafana-ui/src/components/ClickOutsideWrapper/ClickOutsideWrapper.tsx b/packages/grafana-ui/src/components/ClickOutsideWrapper/ClickOutsideWrapper.tsx
index 6836f56a69e..6c59290ff47 100644
--- a/packages/grafana-ui/src/components/ClickOutsideWrapper/ClickOutsideWrapper.tsx
+++ b/packages/grafana-ui/src/components/ClickOutsideWrapper/ClickOutsideWrapper.tsx
@@ -35,7 +35,7 @@ export class ClickOutsideWrapper extends PureComponent<Props, State> {
   componentWillUnmount() {
     window.removeEventListener('click', this.onOutsideClick, false);
     if (this.props.includeButtonPress) {
-      window.addEventListener('keyup', this.onOutsideClick, false);
+      window.removeEventListener('keyup', this.onOutsideClick, false);
     }
   }