diff --git a/root/static/scripts/common/components/Popover.js b/root/static/scripts/common/components/Popover.js
index 73bc7a61fdb..58ecde53cd2 100644
--- a/root/static/scripts/common/components/Popover.js
+++ b/root/static/scripts/common/components/Popover.js
@@ -76,7 +76,7 @@ const Popover = (props: PropsT): React.Portal => {
       dialogRef={dialogRef}
       onEscape={closeAndReturnFocus}
       siblings={<div data-popper-arrow />}
-      trapFocus={false}
+      trapFocus
     >
       {buildChildren(closeAndReturnFocus)}
     </Dialog>,