diff --git a/src/attributes/views/AttributeList/AttributeList.tsx b/src/attributes/views/AttributeList/AttributeList.tsx
index b3aa785ba..dc4c5a669 100644
--- a/src/attributes/views/AttributeList/AttributeList.tsx
+++ b/src/attributes/views/AttributeList/AttributeList.tsx
@@ -1,10 +1,10 @@
 import { IconButton } from "@material-ui/core";
 import DeleteIcon from "@material-ui/icons/Delete";
 import {
-  areFiltersApplied,
   deleteFilterTab,
   getActiveFilters,
   getFilterOpts,
+  getFiltersCurrentTab,
   getFilterTabs,
   getFilterVariables,
   saveFilterTab
@@ -92,12 +92,7 @@ const AttributeList: React.FC<AttributeListProps> = ({ params }) => {
 
   const tabs = getFilterTabs();
 
-  const currentTab =
-    params.activeTab === undefined
-      ? areFiltersApplied(params)
-        ? tabs.length + 1
-        : 0
-      : parseInt(params.activeTab, 0);
+  const currentTab = getFiltersCurrentTab(params, tabs);
 
   const [openModal, closeModal] = createDialogActionHandlers<
     AttributeListUrlDialog,
diff --git a/src/attributes/views/AttributeList/filters.ts b/src/attributes/views/AttributeList/filters.ts
index ac8a3a961..f582b964f 100644
--- a/src/attributes/views/AttributeList/filters.ts
+++ b/src/attributes/views/AttributeList/filters.ts
@@ -132,7 +132,10 @@ export const {
   saveFilterTab
 } = createFilterTabUtils<AttributeListUrlFilters>(ATTRIBUTE_FILTERS_KEY);
 
-export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
-  AttributeListUrlQueryParams,
-  AttributeListUrlFilters
->(AttributeListUrlFiltersEnum);
+export const {
+  areFiltersApplied,
+  getActiveFilters,
+  getFiltersCurrentTab
+} = createFilterUtils<AttributeListUrlQueryParams, AttributeListUrlFilters>(
+  AttributeListUrlFiltersEnum
+);
diff --git a/src/categories/views/CategoryList/CategoryList.tsx b/src/categories/views/CategoryList/CategoryList.tsx
index 5af59c75e..18e9ea92e 100644
--- a/src/categories/views/CategoryList/CategoryList.tsx
+++ b/src/categories/views/CategoryList/CategoryList.tsx
@@ -33,9 +33,9 @@ import {
   categoryUrl
 } from "../../urls";
 import {
-  areFiltersApplied,
   deleteFilterTab,
   getActiveFilters,
+  getFiltersCurrentTab,
   getFilterTabs,
   getFilterVariables,
   saveFilterTab
@@ -73,12 +73,7 @@ export const CategoryList: React.FC<CategoryListProps> = ({ params }) => {
 
   const tabs = getFilterTabs();
 
-  const currentTab =
-    params.activeTab === undefined
-      ? areFiltersApplied(params)
-        ? tabs.length + 1
-        : 0
-      : parseInt(params.activeTab, 0);
+  const currentTab = getFiltersCurrentTab(params, tabs);
 
   const changeFilterField = (filter: CategoryListUrlFilters) => {
     reset();
diff --git a/src/categories/views/CategoryList/filter.ts b/src/categories/views/CategoryList/filter.ts
index fc42e95b9..abe5fd453 100644
--- a/src/categories/views/CategoryList/filter.ts
+++ b/src/categories/views/CategoryList/filter.ts
@@ -26,7 +26,10 @@ export const {
   saveFilterTab
 } = createFilterTabUtils<CategoryListUrlFilters>(CATEGORY_FILTERS_KEY);
 
-export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
-  CategoryListUrlQueryParams,
-  CategoryListUrlFilters
->(CategoryListUrlFiltersEnum);
+export const {
+  areFiltersApplied,
+  getActiveFilters,
+  getFiltersCurrentTab
+} = createFilterUtils<CategoryListUrlQueryParams, CategoryListUrlFilters>(
+  CategoryListUrlFiltersEnum
+);
diff --git a/src/collections/views/CollectionList/CollectionList.tsx b/src/collections/views/CollectionList/CollectionList.tsx
index f309bfbb7..3f170d6c1 100644
--- a/src/collections/views/CollectionList/CollectionList.tsx
+++ b/src/collections/views/CollectionList/CollectionList.tsx
@@ -36,11 +36,11 @@ import {
   collectionUrl
 } from "../../urls";
 import {
-  areFiltersApplied,
   deleteFilterTab,
   getActiveFilters,
   getFilterOpts,
   getFilterQueryParam,
+  getFiltersCurrentTab,
   getFilterTabs,
   getFilterVariables,
   saveFilterTab
@@ -129,12 +129,7 @@ export const CollectionList: React.FC<CollectionListProps> = ({ params }) => {
     }
   }, [params]);
 
-  const currentTab =
-    params.activeTab === undefined
-      ? areFiltersApplied(params)
-        ? tabs.length + 1
-        : 0
-      : parseInt(params.activeTab, 0);
+  const currentTab = getFiltersCurrentTab(params, tabs);
 
   const [openModal, closeModal] = createDialogActionHandlers<
     CollectionListUrlDialog,
diff --git a/src/collections/views/CollectionList/filters.ts b/src/collections/views/CollectionList/filters.ts
index 927b11122..07a6ee9fb 100644
--- a/src/collections/views/CollectionList/filters.ts
+++ b/src/collections/views/CollectionList/filters.ts
@@ -78,7 +78,10 @@ export const {
   saveFilterTab
 } = createFilterTabUtils<CollectionListUrlFilters>(COLLECTION_FILTERS_KEY);
 
-export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
-  CollectionListUrlQueryParams,
-  CollectionListUrlFilters
->(CollectionListUrlFiltersEnum);
+export const {
+  areFiltersApplied,
+  getActiveFilters,
+  getFiltersCurrentTab
+} = createFilterUtils<CollectionListUrlQueryParams, CollectionListUrlFilters>(
+  CollectionListUrlFiltersEnum
+);
diff --git a/src/customers/views/CustomerList/CustomerList.tsx b/src/customers/views/CustomerList/CustomerList.tsx
index 812b75e1d..19ad1e9b0 100644
--- a/src/customers/views/CustomerList/CustomerList.tsx
+++ b/src/customers/views/CustomerList/CustomerList.tsx
@@ -35,11 +35,11 @@ import {
   customerUrl
 } from "../../urls";
 import {
-  areFiltersApplied,
   deleteFilterTab,
   getActiveFilters,
   getFilterOpts,
   getFilterQueryParam,
+  getFiltersCurrentTab,
   getFilterTabs,
   getFilterVariables,
   saveFilterTab
@@ -78,12 +78,7 @@ export const CustomerList: React.FC<CustomerListProps> = ({ params }) => {
 
   const tabs = getFilterTabs();
 
-  const currentTab =
-    params.activeTab === undefined
-      ? areFiltersApplied(params)
-        ? tabs.length + 1
-        : 0
-      : parseInt(params.activeTab, 0);
+  const currentTab = getFiltersCurrentTab(params, tabs);
 
   const [
     changeFilters,
diff --git a/src/customers/views/CustomerList/filters.ts b/src/customers/views/CustomerList/filters.ts
index 513c3611d..c01744508 100644
--- a/src/customers/views/CustomerList/filters.ts
+++ b/src/customers/views/CustomerList/filters.ts
@@ -97,7 +97,10 @@ export const {
   saveFilterTab
 } = createFilterTabUtils<CustomerListUrlFilters>(CUSTOMER_FILTERS_KEY);
 
-export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
-  CustomerListUrlQueryParams,
-  CustomerListUrlFilters
->(CustomerListUrlFiltersEnum);
+export const {
+  areFiltersApplied,
+  getActiveFilters,
+  getFiltersCurrentTab
+} = createFilterUtils<CustomerListUrlQueryParams, CustomerListUrlFilters>(
+  CustomerListUrlFiltersEnum
+);
diff --git a/src/discounts/views/SaleList/SaleList.tsx b/src/discounts/views/SaleList/SaleList.tsx
index ea866cdcb..393f2c64c 100644
--- a/src/discounts/views/SaleList/SaleList.tsx
+++ b/src/discounts/views/SaleList/SaleList.tsx
@@ -37,11 +37,11 @@ import {
   saleUrl
 } from "../../urls";
 import {
-  areFiltersApplied,
   deleteFilterTab,
   getActiveFilters,
   getFilterOpts,
   getFilterQueryParam,
+  getFiltersCurrentTab,
   getFilterTabs,
   getFilterVariables,
   saveFilterTab
@@ -93,12 +93,7 @@ export const SaleList: React.FC<SaleListProps> = ({ params }) => {
 
   const tabs = getFilterTabs();
 
-  const currentTab =
-    params.activeTab === undefined
-      ? areFiltersApplied(params)
-        ? tabs.length + 1
-        : 0
-      : parseInt(params.activeTab, 0);
+  const currentTab = getFiltersCurrentTab(params, tabs);
 
   const [
     changeFilters,
diff --git a/src/discounts/views/SaleList/filters.ts b/src/discounts/views/SaleList/filters.ts
index ff2ea9007..09896ebc9 100644
--- a/src/discounts/views/SaleList/filters.ts
+++ b/src/discounts/views/SaleList/filters.ts
@@ -123,10 +123,11 @@ export const {
   saveFilterTab
 } = createFilterTabUtils<SaleListUrlFilters>(SALE_FILTERS_KEY);
 
-export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
-  SaleListUrlQueryParams,
-  SaleListUrlFilters
->({
+export const {
+  areFiltersApplied,
+  getActiveFilters,
+  getFiltersCurrentTab
+} = createFilterUtils<SaleListUrlQueryParams, SaleListUrlFilters>({
   ...SaleListUrlFiltersEnum,
   ...SaleListUrlFiltersWithMultipleValues
 });
diff --git a/src/discounts/views/VoucherList/VoucherList.tsx b/src/discounts/views/VoucherList/VoucherList.tsx
index 70bbbfeb8..1db4d3be5 100644
--- a/src/discounts/views/VoucherList/VoucherList.tsx
+++ b/src/discounts/views/VoucherList/VoucherList.tsx
@@ -37,11 +37,11 @@ import {
   voucherUrl
 } from "../../urls";
 import {
-  areFiltersApplied,
   deleteFilterTab,
   getActiveFilters,
   getFilterOpts,
   getFilterQueryParam,
+  getFiltersCurrentTab,
   getFilterTabs,
   getFilterVariables,
   saveFilterTab
@@ -94,12 +94,7 @@ export const VoucherList: React.FC<VoucherListProps> = ({ params }) => {
 
   const tabs = getFilterTabs();
 
-  const currentTab =
-    params.activeTab === undefined
-      ? areFiltersApplied(params)
-        ? tabs.length + 1
-        : 0
-      : parseInt(params.activeTab, 0);
+  const currentTab = getFiltersCurrentTab(params, tabs);
 
   const [
     changeFilters,
diff --git a/src/discounts/views/VoucherList/filters.ts b/src/discounts/views/VoucherList/filters.ts
index 8f5a3a1b9..379359973 100644
--- a/src/discounts/views/VoucherList/filters.ts
+++ b/src/discounts/views/VoucherList/filters.ts
@@ -153,10 +153,11 @@ export const {
   saveFilterTab
 } = createFilterTabUtils<VoucherListUrlFilters>(VOUCHER_FILTERS_KEY);
 
-export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
-  VoucherListUrlQueryParams,
-  VoucherListUrlFilters
->({
+export const {
+  areFiltersApplied,
+  getActiveFilters,
+  getFiltersCurrentTab
+} = createFilterUtils<VoucherListUrlQueryParams, VoucherListUrlFilters>({
   ...VoucherListUrlFiltersEnum,
   ...VoucherListUrlFiltersWithMultipleValues
 });
diff --git a/src/orders/views/OrderDraftList/OrderDraftList.tsx b/src/orders/views/OrderDraftList/OrderDraftList.tsx
index c5e8e2a4a..4e807c76c 100644
--- a/src/orders/views/OrderDraftList/OrderDraftList.tsx
+++ b/src/orders/views/OrderDraftList/OrderDraftList.tsx
@@ -40,11 +40,11 @@ import {
   orderUrl
 } from "../../urls";
 import {
-  areFiltersApplied,
   deleteFilterTab,
   getActiveFilters,
   getFilterOpts,
   getFilterQueryParam,
+  getFiltersCurrentTab,
   getFilterTabs,
   getFilterVariables,
   saveFilterTab
@@ -90,12 +90,7 @@ export const OrderDraftList: React.FC<OrderDraftListProps> = ({ params }) => {
 
   const tabs = getFilterTabs();
 
-  const currentTab =
-    params.activeTab === undefined
-      ? areFiltersApplied(params)
-        ? tabs.length + 1
-        : 0
-      : parseInt(params.activeTab, 0);
+  const currentTab = getFiltersCurrentTab(params, tabs);
 
   const [
     changeFilters,
diff --git a/src/orders/views/OrderDraftList/filters.ts b/src/orders/views/OrderDraftList/filters.ts
index 6f82a85c3..e622bf2d4 100644
--- a/src/orders/views/OrderDraftList/filters.ts
+++ b/src/orders/views/OrderDraftList/filters.ts
@@ -85,7 +85,10 @@ export const {
   saveFilterTab
 } = createFilterTabUtils<OrderDraftListUrlFilters>(ORDER_DRAFT_FILTERS_KEY);
 
-export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
-  OrderDraftListUrlQueryParams,
-  OrderDraftListUrlFilters
->(OrderDraftListUrlFiltersEnum);
+export const {
+  areFiltersApplied,
+  getActiveFilters,
+  getFiltersCurrentTab
+} = createFilterUtils<OrderDraftListUrlQueryParams, OrderDraftListUrlFilters>(
+  OrderDraftListUrlFiltersEnum
+);
diff --git a/src/orders/views/OrderList/OrderList.tsx b/src/orders/views/OrderList/OrderList.tsx
index f2d24e907..7c41455eb 100644
--- a/src/orders/views/OrderList/OrderList.tsx
+++ b/src/orders/views/OrderList/OrderList.tsx
@@ -33,11 +33,11 @@ import {
   orderUrl
 } from "../../urls";
 import {
-  areFiltersApplied,
   deleteFilterTab,
   getActiveFilters,
   getFilterOpts,
   getFilterQueryParam,
+  getFiltersCurrentTab,
   getFilterTabs,
   getFilterVariables,
   saveFilterTab
@@ -85,12 +85,7 @@ export const OrderList: React.FC<OrderListProps> = ({ params }) => {
 
   const tabs = getFilterTabs();
 
-  const currentTab =
-    params.activeTab === undefined
-      ? areFiltersApplied(params)
-        ? tabs.length + 1
-        : 0
-      : parseInt(params.activeTab, 0);
+  const currentTab = getFiltersCurrentTab(params, tabs);
 
   const [
     changeFilters,
diff --git a/src/orders/views/OrderList/filters.ts b/src/orders/views/OrderList/filters.ts
index 0324d0c35..67a5c31e6 100644
--- a/src/orders/views/OrderList/filters.ts
+++ b/src/orders/views/OrderList/filters.ts
@@ -116,10 +116,11 @@ export const {
   saveFilterTab
 } = createFilterTabUtils<OrderListUrlFilters>(ORDER_FILTERS_KEY);
 
-export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
-  OrderListUrlQueryParams,
-  OrderListUrlFilters
->({
+export const {
+  areFiltersApplied,
+  getActiveFilters,
+  getFiltersCurrentTab
+} = createFilterUtils<OrderListUrlQueryParams, OrderListUrlFilters>({
   ...OrderListUrlFiltersEnum,
   ...OrderListUrlFiltersWithMultipleValues
 });
diff --git a/src/pageTypes/views/PageTypeList/PageTypeList.tsx b/src/pageTypes/views/PageTypeList/PageTypeList.tsx
index 85ecb4730..c6e7335a7 100644
--- a/src/pageTypes/views/PageTypeList/PageTypeList.tsx
+++ b/src/pageTypes/views/PageTypeList/PageTypeList.tsx
@@ -36,9 +36,9 @@ import {
   pageTypeUrl
 } from "../../urls";
 import {
-  areFiltersApplied,
   deleteFilterTab,
   getActiveFilters,
+  getFiltersCurrentTab,
   getFilterTabs,
   getFilterVariables,
   saveFilterTab
@@ -79,12 +79,7 @@ export const PageTypeList: React.FC<PageTypeListProps> = ({ params }) => {
 
   const tabs = getFilterTabs();
 
-  const currentTab =
-    params.activeTab === undefined
-      ? areFiltersApplied(params)
-        ? tabs.length + 1
-        : 0
-      : parseInt(params.activeTab, 0);
+  const currentTab = getFiltersCurrentTab(params, tabs);
 
   const changeFilterField = (filter: PageTypeListUrlFilters) => {
     reset();
diff --git a/src/pageTypes/views/PageTypeList/filters.ts b/src/pageTypes/views/PageTypeList/filters.ts
index c3b00d4e8..746ae0795 100644
--- a/src/pageTypes/views/PageTypeList/filters.ts
+++ b/src/pageTypes/views/PageTypeList/filters.ts
@@ -26,7 +26,10 @@ export const {
   saveFilterTab
 } = createFilterTabUtils<PageTypeListUrlFilters>(PAGE_TYPE_FILTERS_KEY);
 
-export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
-  PageTypeListUrlQueryParams,
-  PageTypeListUrlFilters
->(PageTypeListUrlFiltersEnum);
+export const {
+  areFiltersApplied,
+  getActiveFilters,
+  getFiltersCurrentTab
+} = createFilterUtils<PageTypeListUrlQueryParams, PageTypeListUrlFilters>(
+  PageTypeListUrlFiltersEnum
+);
diff --git a/src/plugins/views/PluginList/PluginList.tsx b/src/plugins/views/PluginList/PluginList.tsx
index 3cb3beb17..87c3369f6 100644
--- a/src/plugins/views/PluginList/PluginList.tsx
+++ b/src/plugins/views/PluginList/PluginList.tsx
@@ -27,11 +27,11 @@ import {
   pluginUrl
 } from "../../urls";
 import {
-  areFiltersApplied,
   deleteFilterTab,
   getActiveFilters,
   getFilterOpts,
   getFilterQueryParam,
+  getFiltersCurrentTab,
   getFilterTabs,
   getFilterVariables,
   saveFilterTab
@@ -65,12 +65,7 @@ export const PluginsList: React.FC<PluginsListProps> = ({ params }) => {
 
   const tabs = getFilterTabs();
 
-  const currentTab =
-    params.activeTab === undefined
-      ? areFiltersApplied(params)
-        ? tabs.length + 1
-        : 0
-      : parseInt(params.activeTab, 0);
+  const currentTab = getFiltersCurrentTab(params, tabs);
 
   const [
     changeFilters,
diff --git a/src/plugins/views/PluginList/filters.ts b/src/plugins/views/PluginList/filters.ts
index 4724a14dc..d3853d15b 100644
--- a/src/plugins/views/PluginList/filters.ts
+++ b/src/plugins/views/PluginList/filters.ts
@@ -123,7 +123,10 @@ export const {
   saveFilterTab
 } = createFilterTabUtils<PluginListUrlFilters>(PLUGIN_FILTERS_KEY);
 
-export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
-  PluginListUrlQueryParams,
-  PluginListUrlFilters
->(PluginListUrlFiltersEnum);
+export const {
+  areFiltersApplied,
+  getActiveFilters,
+  getFiltersCurrentTab
+} = createFilterUtils<PluginListUrlQueryParams, PluginListUrlFilters>(
+  PluginListUrlFiltersEnum
+);
diff --git a/src/productTypes/views/ProductTypeList/ProductTypeList.tsx b/src/productTypes/views/ProductTypeList/ProductTypeList.tsx
index 023d13c56..8f6956c0c 100644
--- a/src/productTypes/views/ProductTypeList/ProductTypeList.tsx
+++ b/src/productTypes/views/ProductTypeList/ProductTypeList.tsx
@@ -37,11 +37,11 @@ import {
   productTypeUrl
 } from "../../urls";
 import {
-  areFiltersApplied,
   deleteFilterTab,
   getActiveFilters,
   getFilterOpts,
   getFilterQueryParam,
+  getFiltersCurrentTab,
   getFilterTabs,
   getFilterVariables,
   saveFilterTab
@@ -83,12 +83,7 @@ export const ProductTypeList: React.FC<ProductTypeListProps> = ({ params }) => {
 
   const tabs = getFilterTabs();
 
-  const currentTab =
-    params.activeTab === undefined
-      ? areFiltersApplied(params)
-        ? tabs.length + 1
-        : 0
-      : parseInt(params.activeTab, 0);
+  const currentTab = getFiltersCurrentTab(params, tabs);
 
   const [
     changeFilters,
diff --git a/src/productTypes/views/ProductTypeList/filters.ts b/src/productTypes/views/ProductTypeList/filters.ts
index cbc457b70..65cd2a90f 100644
--- a/src/productTypes/views/ProductTypeList/filters.ts
+++ b/src/productTypes/views/ProductTypeList/filters.ts
@@ -80,7 +80,10 @@ export const {
   saveFilterTab
 } = createFilterTabUtils<ProductTypeListUrlFilters>(PRODUCT_TYPE_FILTERS_KEY);
 
-export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
-  ProductTypeListUrlQueryParams,
-  ProductTypeListUrlFilters
->(ProductTypeListUrlFiltersEnum);
+export const {
+  areFiltersApplied,
+  getActiveFilters,
+  getFiltersCurrentTab
+} = createFilterUtils<ProductTypeListUrlQueryParams, ProductTypeListUrlFilters>(
+  ProductTypeListUrlFiltersEnum
+);
diff --git a/src/products/views/ProductList/ProductList.tsx b/src/products/views/ProductList/ProductList.tsx
index eb48515f8..27b3298ff 100644
--- a/src/products/views/ProductList/ProductList.tsx
+++ b/src/products/views/ProductList/ProductList.tsx
@@ -68,11 +68,11 @@ import {
   useProductExport
 } from "../../mutations";
 import {
-  areFiltersApplied,
   deleteFilterTab,
   getActiveFilters,
   getFilterOpts,
   getFilterQueryParam,
+  getFiltersCurrentTab,
   getFilterTabs,
   getFilterVariables,
   saveFilterTab
@@ -192,12 +192,7 @@ export const ProductList: React.FC<ProductListProps> = ({ params }) => {
 
   const tabs = getFilterTabs();
 
-  const currentTab =
-    params.activeTab === undefined
-      ? areFiltersApplied(params)
-        ? tabs.length + 1
-        : 0
-      : parseInt(params.activeTab, 0);
+  const currentTab = getFiltersCurrentTab(params, tabs);
 
   const countAllProducts = useProductCountQuery({
     skip: params.action !== "export"
diff --git a/src/products/views/ProductList/filters.ts b/src/products/views/ProductList/filters.ts
index c0ee3b423..03c50c092 100644
--- a/src/products/views/ProductList/filters.ts
+++ b/src/products/views/ProductList/filters.ts
@@ -386,10 +386,11 @@ export const {
   saveFilterTab
 } = createFilterTabUtils<ProductListUrlFilters>(PRODUCT_FILTERS_KEY);
 
-export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
-  ProductListUrlQueryParams,
-  ProductListUrlFilters
->({
+export const {
+  areFiltersApplied,
+  getActiveFilters,
+  getFiltersCurrentTab
+} = createFilterUtils<ProductListUrlQueryParams, ProductListUrlFilters>({
   ...ProductListUrlFiltersEnum,
   ...ProductListUrlFiltersWithMultipleValues,
   ...ProductListUrlFiltersAsDictWithMultipleValues
diff --git a/src/staff/views/StaffList/StaffList.tsx b/src/staff/views/StaffList/StaffList.tsx
index fd3e19cd0..6d2eef3ee 100644
--- a/src/staff/views/StaffList/StaffList.tsx
+++ b/src/staff/views/StaffList/StaffList.tsx
@@ -38,11 +38,11 @@ import {
   staffMemberDetailsUrl
 } from "../../urls";
 import {
-  areFiltersApplied,
   deleteFilterTab,
   getActiveFilters,
   getFilterOpts,
   getFilterQueryParam,
+  getFiltersCurrentTab,
   getFilterTabs,
   getFilterVariables,
   saveFilterTab
@@ -103,12 +103,7 @@ export const StaffList: React.FC<StaffListProps> = ({ params }) => {
 
   const tabs = getFilterTabs();
 
-  const currentTab =
-    params.activeTab === undefined
-      ? areFiltersApplied(params)
-        ? tabs.length + 1
-        : 0
-      : parseInt(params.activeTab, 0);
+  const currentTab = getFiltersCurrentTab(params, tabs);
 
   const [
     changeFilters,
diff --git a/src/staff/views/StaffList/filters.ts b/src/staff/views/StaffList/filters.ts
index d38f80090..50fac86cf 100644
--- a/src/staff/views/StaffList/filters.ts
+++ b/src/staff/views/StaffList/filters.ts
@@ -62,7 +62,10 @@ export const {
   saveFilterTab
 } = createFilterTabUtils<StaffListUrlFilters>(STAFF_FILTERS_KEY);
 
-export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
-  StaffListUrlQueryParams,
-  StaffListUrlFilters
->(StaffListUrlFiltersEnum);
+export const {
+  areFiltersApplied,
+  getActiveFilters,
+  getFiltersCurrentTab
+} = createFilterUtils<StaffListUrlQueryParams, StaffListUrlFilters>(
+  StaffListUrlFiltersEnum
+);
diff --git a/src/utils/filters/filters.ts b/src/utils/filters/filters.ts
index 6f283daea..03652d0c5 100644
--- a/src/utils/filters/filters.ts
+++ b/src/utils/filters/filters.ts
@@ -1,5 +1,6 @@
 import { IFilter, IFilterElement } from "@saleor/components/Filter";
 import { findValueInEnum } from "@saleor/misc";
+import { ActiveTab } from "@saleor/types";
 import isArray from "lodash/isArray";
 
 function createFilterUtils<
@@ -19,9 +20,21 @@ function createFilterUtils<
     return Object.keys(getActiveFilters(params)).some(key => !!params[key]);
   }
 
+  function getFiltersCurrentTab<TQueryTabParams extends ActiveTab>(
+    params: TQueryTabParams,
+    tabs: unknown[]
+  ) {
+    return params.activeTab === undefined
+      ? areFiltersApplied((params as unknown) as TQueryParams)
+        ? tabs.length + 1
+        : 0
+      : parseInt(params.activeTab, 0);
+  }
+
   return {
     areFiltersApplied,
-    getActiveFilters
+    getActiveFilters,
+    getFiltersCurrentTab
   };
 }
 
diff --git a/src/warehouses/views/WarehouseList/WarehouseList.tsx b/src/warehouses/views/WarehouseList/WarehouseList.tsx
index bbc9ed8ab..8fe3fa3e2 100644
--- a/src/warehouses/views/WarehouseList/WarehouseList.tsx
+++ b/src/warehouses/views/WarehouseList/WarehouseList.tsx
@@ -35,9 +35,9 @@ import React from "react";
 import { useIntl } from "react-intl";
 
 import {
-  areFiltersApplied,
   deleteFilterTab,
   getActiveFilters,
+  getFiltersCurrentTab,
   getFilterTabs,
   getFilterVariables,
   saveFilterTab
@@ -91,12 +91,7 @@ const WarehouseList: React.FC<WarehouseListProps> = ({ params }) => {
 
   const tabs = getFilterTabs();
 
-  const currentTab =
-    params.activeTab === undefined
-      ? areFiltersApplied(params)
-        ? tabs.length + 1
-        : 0
-      : parseInt(params.activeTab, 0);
+  const currentTab = getFiltersCurrentTab(params, tabs);
 
   const [, resetFilters, handleSearchChange] = createFilterHandlers({
     createUrl: warehouseListUrl,
diff --git a/src/warehouses/views/WarehouseList/filters.ts b/src/warehouses/views/WarehouseList/filters.ts
index 3bb609cbc..4ea04523f 100644
--- a/src/warehouses/views/WarehouseList/filters.ts
+++ b/src/warehouses/views/WarehouseList/filters.ts
@@ -26,7 +26,10 @@ export const {
   saveFilterTab
 } = createFilterTabUtils<WarehouseListUrlFilters>(WAREHOUSE_FILTERS_KEY);
 
-export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
-  WarehouseListUrlQueryParams,
-  WarehouseListUrlFilters
->(WarehouseListUrlFiltersEnum);
+export const {
+  areFiltersApplied,
+  getActiveFilters,
+  getFiltersCurrentTab
+} = createFilterUtils<WarehouseListUrlQueryParams, WarehouseListUrlFilters>(
+  WarehouseListUrlFiltersEnum
+);