diff --git a/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx b/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx
index 051b8518622..568933aeb21 100644
--- a/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx
+++ b/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx
@@ -73,12 +73,12 @@ export const Dropdown = React.memo(({ children, overlay, placement, offset, onVi
   const animationStyles = useStyles2(getStyles, animationDuration);
 
   const onOverlayClicked = () => {
-    setShow(false);
+    handleOpenChange(false);
   };
 
   const handleKeys = (event: React.KeyboardEvent) => {
     if (event.key === 'Tab') {
-      setShow(false);
+      handleOpenChange(false);
     }
   };