diff --git a/packages/grafana-ui/src/components/Drawer/Drawer.tsx b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
index 80fea394303..90a584e8702 100644
--- a/packages/grafana-ui/src/components/Drawer/Drawer.tsx
+++ b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
@@ -73,7 +73,8 @@ export function Drawer({
 
   // Adds body class while open so the toolbar nav can hide some actions while drawer is open
   useBodyClassWhileOpen();
-  useClickAway(overlayRef, onClose);
+  // Close when we click outside mask (topnav) but only if closeOnMaskClick is true
+  useClickAway(overlayRef, closeOnMaskClick ? onClose : doNothing);
 
   // Apply size styles (unless deprecated width prop is used)
   const rootClass = cx(styles.drawer, !width && styles.sizes[size]);
@@ -142,6 +143,8 @@ export function Drawer({
   );
 }
 
+function doNothing() {}
+
 function useBodyClassWhileOpen() {
   useEffect(() => {
     if (!document.body) {