diff --git a/src/components/Filter/FilterActions.tsx b/src/components/Filter/FilterActions.tsx
index bf048a9d7..21266ae12 100644
--- a/src/components/Filter/FilterActions.tsx
+++ b/src/components/Filter/FilterActions.tsx
@@ -48,11 +48,11 @@ export interface FilterActionsPropsSearch {
   search: string;
   onSearchChange: (event: React.ChangeEvent<any>) => void;
 }
-export interface FilterActionsPropsFilters {
+export interface FilterActionsPropsFilters<TKeys = string> {
   currencySymbol: string;
-  menu: IFilter;
+  menu: IFilter<TKeys>;
   filterLabel: string;
-  onFilterAdd: (filter: FilterContentSubmitData) => void;
+  onFilterAdd: (filter: FilterContentSubmitData<TKeys>) => void;
 }
 
 export const FilterActionsOnlySearch: React.FC<
diff --git a/src/components/FilterBar/FilterBar.tsx b/src/components/FilterBar/FilterBar.tsx
index 43ac33270..ed084541e 100644
--- a/src/components/FilterBar/FilterBar.tsx
+++ b/src/components/FilterBar/FilterBar.tsx
@@ -6,8 +6,8 @@ import Debounce from "../Debounce";
 import { IFilter } from "../Filter/types";
 import FilterTabs, { FilterChips, FilterTab } from "../TableFilter";
 
-export interface FilterBarProps extends FilterProps {
-  filterMenu: IFilter;
+export interface FilterBarProps<TKeys = string> extends FilterProps {
+  filterMenu: IFilter<TKeys>;
 }
 
 const FilterBar: React.FC<FilterBarProps> = ({
diff --git a/src/orders/components/OrderListFilter/OrderListFilter.tsx b/src/orders/components/OrderListFilter/OrderListFilter.tsx
index 4da8d652c..df399abcf 100644
--- a/src/orders/components/OrderListFilter/OrderListFilter.tsx
+++ b/src/orders/components/OrderListFilter/OrderListFilter.tsx
@@ -9,7 +9,7 @@ import TimezoneContext from "@saleor/components/Timezone";
 import { FilterProps } from "../../../types";
 import { OrderStatusFilter } from "../../../types/globalTypes";
 
-type OrderListFilterProps = FilterProps;
+type OrderListFilterProps = FilterProps<OrderFilterKeys>;
 
 export enum OrderFilterKeys {
   date = "date",
diff --git a/src/orders/components/OrderListPage/OrderListPage.tsx b/src/orders/components/OrderListPage/OrderListPage.tsx
index 67b7947d0..0e89cabd2 100644
--- a/src/orders/components/OrderListPage/OrderListPage.tsx
+++ b/src/orders/components/OrderListPage/OrderListPage.tsx
@@ -7,16 +7,15 @@ import { FormattedMessage, useIntl } from "react-intl";
 import Container from "@saleor/components/Container";
 import PageHeader from "@saleor/components/PageHeader";
 import { sectionNames } from "@saleor/intl";
-import { OrderFilterKeys } from "@saleor/orders/components/OrderListFilter";
 import { FilterPageProps, ListActions, PageListProps } from "@saleor/types";
 import { OrderList_orders_edges_node } from "../../types/OrderList";
 import OrderList from "../OrderList";
-import OrderListFilter from "../OrderListFilter";
+import OrderListFilter, { OrderFilterKeys } from "../OrderListFilter";
 
 export interface OrderListPageProps
   extends PageListProps,
     ListActions,
-    FilterPageProps {
+    FilterPageProps<OrderFilterKeys> {
   orders: OrderList_orders_edges_node[];
 }
 
diff --git a/src/products/components/ProductListPage/ProductListPage.tsx b/src/products/components/ProductListPage/ProductListPage.tsx
index 5a200eaf5..7f89ff158 100644
--- a/src/products/components/ProductListPage/ProductListPage.tsx
+++ b/src/products/components/ProductListPage/ProductListPage.tsx
@@ -30,7 +30,7 @@ import ProductListFilter, { ProductFilterKeys } from "../ProductListFilter";
 export interface ProductListPageProps
   extends PageListProps<ProductListColumns>,
     ListActions,
-    FilterPageProps,
+    FilterPageProps<ProductFilterKeys>,
     FetchMoreProps {
   availableInGridAttributes: AvailableInGridAttributes_availableInGrid_edges_node[];
   currencySymbol: string;
diff --git a/src/types.ts b/src/types.ts
index 245eddcea..f47628fa7 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -70,16 +70,20 @@ export interface SearchPageProps {
   initialSearch: string;
   onSearchChange: (value: string) => void;
 }
-export interface FilterPageProps extends SearchPageProps, TabPageProps {
+export interface FilterPageProps<TKeys = string>
+  extends SearchPageProps,
+    TabPageProps {
   currencySymbol: string;
   filtersList: Filter[];
-  onFilterAdd: (filter: FilterContentSubmitData) => void;
+  onFilterAdd: (filter: FilterContentSubmitData<TKeys>) => void;
 }
 
 export interface SearchProps {
   searchPlaceholder: string;
 }
-export interface FilterProps extends FilterPageProps, SearchProps {
+export interface FilterProps<TKeys = string>
+  extends FilterPageProps<TKeys>,
+    SearchProps {
   allTabLabel: string;
   filterLabel: string;
 }