diff --git a/packages/bbui/src/Actions/click_outside.js b/packages/bbui/src/Actions/click_outside.js
index 305ae65ac8..7873b7fd6c 100644
--- a/packages/bbui/src/Actions/click_outside.js
+++ b/packages/bbui/src/Actions/click_outside.js
@@ -1,4 +1,8 @@
-const ignoredClasses = [".flatpickr-calendar", ".download-js-link"]
+const ignoredClasses = [
+  ".flatpickr-calendar",
+  ".spectrum-Popover",
+  ".download-js-link",
+]
 let clickHandlers = []
 
 /**
@@ -21,13 +25,6 @@ const handleClick = event => {
       return
     }
 
-    // Ignore clicks for popovers, unless the handler is registered from one
-    const sourceInPopover = handler.anchor.closest(".spectrum-Popover") != null
-    const clickInPopover = event.target.closest(".spectrum-Popover") != null
-    if (clickInPopover && !sourceInPopover) {
-      return
-    }
-
     // Ignore clicks for modals, unless the handler is registered from one
     const sourceInModal = handler.anchor.closest(".spectrum-Underlay") != null
     const clickInModal = event.target.closest(".spectrum-Underlay") != null