diff --git a/packages/calcite-components/src/components/filter/filter.e2e.ts b/packages/calcite-components/src/components/filter/filter.e2e.ts
index 3a76f81fd33..a0b9e9c5b7a 100644
--- a/packages/calcite-components/src/components/filter/filter.e2e.ts
+++ b/packages/calcite-components/src/components/filter/filter.e2e.ts
@@ -17,7 +17,9 @@ describe("calcite-filter", () => {
   });
 
   describe("is focused", () => {
-    focusable("calcite-filter");
+    focusable("calcite-filter", {
+      shadowFocusTargetSelector: "calcite-input",
+    });
   });
 
   describe("disabled", () => {
diff --git a/packages/calcite-components/src/components/filter/filter.tsx b/packages/calcite-components/src/components/filter/filter.tsx
index fd07e46c181..cd9baae01d6 100644
--- a/packages/calcite-components/src/components/filter/filter.tsx
+++ b/packages/calcite-components/src/components/filter/filter.tsx
@@ -223,7 +223,7 @@ export class Filter
   async setFocus(): Promise<void> {
     await componentFocusable(this);
 
-    this.el?.focus();
+    return this.textInput?.setFocus();
   }
 
   // --------------------------------------------------------------------------