diff --git a/app/assets/stylesheets/polaris_view_components.css b/app/assets/stylesheets/polaris_view_components.css
index b5971fd4..4f3ded52 100644
--- a/app/assets/stylesheets/polaris_view_components.css
+++ b/app/assets/stylesheets/polaris_view_components.css
@@ -387,7 +387,9 @@
 }.Polaris-Popover__PopoverOverlay--closed {
   visibility: hidden;
   pointer-events: none;
-}/* Filters */.Polaris-LegacyFilters-ConnectedFilterControl__RightContainer .Polaris-LegacyFilters-ConnectedFilterControl__Item > div > div > button {
+}/* Filters */.Polaris-LegacyFilters-ConnectedFilterControl__RightContainer .Polaris-LegacyFilters-ConnectedFilterControl__Item {
+    z-index: auto;
+  }.Polaris-LegacyFilters-ConnectedFilterControl__RightContainer .Polaris-LegacyFilters-ConnectedFilterControl__Item > div > div > button {
       margin-right: -1px;
       border-radius: 0;
     }.Polaris-LegacyFilters-ConnectedFilterControl__RightContainer .Polaris-LegacyFilters-ConnectedFilterControl__Item:first-of-type > div > div > button {
diff --git a/app/assets/stylesheets/polaris_view_components/custom.pcss b/app/assets/stylesheets/polaris_view_components/custom.pcss
index 261a0407..0ce913e3 100644
--- a/app/assets/stylesheets/polaris_view_components/custom.pcss
+++ b/app/assets/stylesheets/polaris_view_components/custom.pcss
@@ -77,9 +77,10 @@ html[class~="Polaris-Summer-Editions-2023"] {
 }
 
 /* Filters */
-
 .Polaris-LegacyFilters-ConnectedFilterControl__RightContainer {
   .Polaris-LegacyFilters-ConnectedFilterControl__Item {
+    z-index: auto;
+
     & > div > div > button {
       margin-right: -1px;
       border-radius: 0;
diff --git a/app/components/polaris/filters_component.rb b/app/components/polaris/filters_component.rb
index df4aaba4..f46f5631 100644
--- a/app/components/polaris/filters_component.rb
+++ b/app/components/polaris/filters_component.rb
@@ -77,7 +77,7 @@ def popover_arguments
           style: ("width: #{@width}" if @width.present?),
           position: :below,
           alignment: :left,
-          append_to_body: true
+          append_to_body: false
         }
       end
 
diff --git a/test/components/polaris/filters_component_test.rb b/test/components/polaris/filters_component_test.rb
index de4a7e77..48479342 100644
--- a/test/components/polaris/filters_component_test.rb
+++ b/test/components/polaris/filters_component_test.rb
@@ -26,9 +26,9 @@ def test_default_filters
             assert_selector "[data-polaris-popover-target='activator']" do
               assert_selector ".Polaris-Button", text: "Filter"
             end
+            assert_selector "[data-polaris-popover-target='popover']", text: "Content"
           end
         end
-        assert_selector "[data-polaris-popover-target='template']", visible: :hidden
       end
     end
   end