From 9c71a906372a3463d4fd20c56fe0eb44b1dceb02 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Sat, 18 Apr 2026 19:49:13 +0100
Subject: [PATCH] fix(base): dismiss hide-fields popover on escape and outside
 click

---
 .../features/base/components/views/view-field-visibility.tsx   | 3 +++
 1 file changed, 3 insertions(+)

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>