diff --git a/apps/client/src/features/base/components/views/view-field-visibility.tsx b/apps/client/src/features/base/components/views/view-field-visibility.tsx
index 9cfe8ee1..183141c8 100644
--- a/apps/client/src/features/base/components/views/view-field-visibility.tsx
+++ b/apps/client/src/features/base/components/views/view-field-visibility.tsx
@@ -68,6 +68,9 @@ export function ViewFieldVisibility({
       position="bottom-end"
       shadow="md"
       width={260}
+      trapFocus
+      closeOnEscape
+      closeOnClickOutside
       withinPortal
     >
       <Popover.Target>{children}</Popover.Target>