diff --git a/src/components/data-table/data-table-filter-list.tsx b/src/components/data-table/data-table-filter-list.tsx
index 400e6177..abe42d51 100644
--- a/src/components/data-table/data-table-filter-list.tsx
+++ b/src/components/data-table/data-table-filter-list.tsx
@@ -215,7 +215,7 @@ export function DataTableFilterList<TData>({
               }
             />
           );
-        case "select": {
+        case "select":
           return (
             <Faceted
               value={
@@ -271,7 +271,6 @@ export function DataTableFilterList<TData>({
               </FacetedContent>
             </Faceted>
           );
-        }
         case "multi-select": {
           const selectedValues = Array.isArray(filter.value)
             ? filter.value
@@ -578,7 +577,7 @@ export function DataTableFilterList<TData>({
                           </span>
                         )}
                       </div>
-                      <Popover modal>
+                      <Popover>
                         <PopoverTrigger asChild>
                           <Button
                             id={fieldTriggerId}
diff --git a/src/components/data-table/data-table-sort-list.tsx b/src/components/data-table/data-table-sort-list.tsx
index c7c8c51e..c1904833 100644
--- a/src/components/data-table/data-table-sort-list.tsx
+++ b/src/components/data-table/data-table-sort-list.tsx
@@ -208,7 +208,7 @@ export function DataTableSortList<TData>({
                 return (
                   <SortableItem key={sort.id} value={sort.id} asChild>
                     <div className="flex items-center gap-2">
-                      <Popover modal>
+                      <Popover>
                         <PopoverTrigger asChild>
                           <Button
                             id={fieldTriggerId}
diff --git a/src/components/ui/faceted.tsx b/src/components/ui/faceted.tsx
index a9521cc0..0b5b7a52 100644
--- a/src/components/ui/faceted.tsx
+++ b/src/components/ui/faceted.tsx
@@ -105,9 +105,9 @@ function Faceted<Multiple extends boolean = false>(
           onValueChange(selectedValue as FacetedValue<Multiple>);
         }
 
-        // requestAnimationFrame(() => {
-        //   setOpen(false);
-        // });
+        requestAnimationFrame(() => {
+          setOpen(false);
+        });
       }
     },
     [multiple, onValueChange, value],