diff --git a/plugins/catalog-react/api-report.md b/plugins/catalog-react/api-report.md
index 7f50e87e03..705ce3feab 100644
--- a/plugins/catalog-react/api-report.md
+++ b/plugins/catalog-react/api-report.md
@@ -645,10 +645,21 @@ export class EntityTypeFilter implements EntityFilter {
   readonly value: string | string[];
 }
 
+// Warning: (ae-missing-release-tag) "EntityTypeFilterProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type EntityTypeFilterProps = {
+  initialFilter?: string;
+  hidden?: boolean;
+};
+
 // Warning: (ae-missing-release-tag) "EntityTypePicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const EntityTypePicker: () => JSX.Element | null;
+export const EntityTypePicker: ({
+  hidden,
+  initialFilter,
+}: EntityTypeFilterProps) => JSX.Element | null;
 
 // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
 // Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
diff --git a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
index d8fa6b6b90..4f5cc96463 100644
--- a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
@@ -22,7 +22,7 @@ import { useEntityTypeFilter } from '../../hooks/useEntityTypeFilter';
 import { alertApiRef, useApi } from '@backstage/core-plugin-api';
 import { Select } from '@backstage/core-components';
 
-type EntityTypeFilterProps = {
+export type EntityTypeFilterProps = {
   initialFilter?: string;
   hidden?: boolean;
 };
@@ -57,7 +57,7 @@ export const EntityTypePicker = ({
     })),
   ];
 
-  return !hidden ? (
+  return hidden ? null : (
     <Box pb={1} pt={1}>
       <Select
         label="Type"
@@ -68,5 +68,5 @@ export const EntityTypePicker = ({
         }
       />
     </Box>
-  ) : null;
+  );
 };
diff --git a/plugins/catalog-react/src/components/EntityTypePicker/index.ts b/plugins/catalog-react/src/components/EntityTypePicker/index.ts
index 6e888516f3..6e3fc60546 100644
--- a/plugins/catalog-react/src/components/EntityTypePicker/index.ts
+++ b/plugins/catalog-react/src/components/EntityTypePicker/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { EntityTypePicker } from './EntityTypePicker';
+export * from './EntityTypePicker';