diff --git a/src/components/filterdialog/filterIndicator.js b/src/components/filterdialog/filterIndicator.js
index 08aa709223..5686aef579 100644
--- a/src/components/filterdialog/filterIndicator.js
+++ b/src/components/filterdialog/filterIndicator.js
@@ -1,6 +1,6 @@
 import './filterIndicator.scss';
 
-export function getFilterStatus(query) {
+function getFilterStatus(query) {
     return Boolean(
         query.Filters
             || query.IsFavorite
@@ -25,7 +25,9 @@ export function getFilterStatus(query) {
     );
 }
 
-export function setFilterStatus(page, hasFilters) {
+export function setFilterStatus(page, query) {
+    const hasFilters = getFilterStatus(query);
+
     const btnFilterWrapper = page.querySelector('.btnFilter-wrapper');
 
     if (btnFilterWrapper) {
diff --git a/src/controllers/livetv/livetvchannels.js b/src/controllers/livetv/livetvchannels.js
index 3ad4538cbd..f0df9b8f05 100644
--- a/src/controllers/livetv/livetvchannels.js
+++ b/src/controllers/livetv/livetvchannels.js
@@ -4,7 +4,7 @@ import libraryBrowser from '../../scripts/libraryBrowser';
 import loading from '../../components/loading/loading';
 import * as userSettings from '../../scripts/settings/userSettings';
 import Events from '../../utils/events.ts';
-import { getFilterStatus, setFilterStatus } from 'components/filterdialog/filterIndicator';
+import { setFilterStatus } from 'components/filterdialog/filterIndicator';
 
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 
@@ -118,8 +118,7 @@ export default function (view, params, tabContent) {
         loading.show();
         isLoading = true;
         const query = getQuery();
-        const hasFilters = getFilterStatus(query);
-        setFilterStatus(context, hasFilters);
+        setFilterStatus(context, query);
 
         const apiClient = ApiClient;
         query.UserId = apiClient.getCurrentUserId();
diff --git a/src/controllers/movies/movies.js b/src/controllers/movies/movies.js
index 439e93410a..717d197e74 100644
--- a/src/controllers/movies/movies.js
+++ b/src/controllers/movies/movies.js
@@ -7,7 +7,7 @@ import cardBuilder from '../../components/cardbuilder/cardBuilder';
 import globalize from '../../lib/globalize';
 import Events from '../../utils/events.ts';
 import { playbackManager } from '../../components/playback/playbackmanager';
-import { getFilterStatus, setFilterStatus } from 'components/filterdialog/filterIndicator';
+import { setFilterStatus } from 'components/filterdialog/filterIndicator';
 
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 
@@ -40,8 +40,7 @@ export default function (view, params, tabContent, options) {
     }
 
     const afterRefresh = (result) => {
-        const hasFilters = getFilterStatus(query);
-        setFilterStatus(tabContent, hasFilters);
+        setFilterStatus(tabContent, query);
 
         function onNextPageClick() {
             if (isLoading) {
diff --git a/src/controllers/movies/movietrailers.js b/src/controllers/movies/movietrailers.js
index 7c12756d65..9607bbc7c6 100644
--- a/src/controllers/movies/movietrailers.js
+++ b/src/controllers/movies/movietrailers.js
@@ -7,7 +7,7 @@ import cardBuilder from '../../components/cardbuilder/cardBuilder';
 import * as userSettings from '../../scripts/settings/userSettings';
 import globalize from '../../lib/globalize';
 import Events from '../../utils/events.ts';
-import { getFilterStatus, setFilterStatus } from 'components/filterdialog/filterIndicator';
+import { setFilterStatus } from 'components/filterdialog/filterIndicator';
 
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 
@@ -53,8 +53,7 @@ export default function (view, params, tabContent) {
         loading.show();
         isLoading = true;
         const query = getQuery();
-        const hasFilters = getFilterStatus(query);
-        setFilterStatus(tabContent, hasFilters);
+        setFilterStatus(tabContent, query);
 
         ApiClient.getItems(ApiClient.getCurrentUserId(), query).then((result) => {
             function onNextPageClick() {
diff --git a/src/controllers/music/musicalbums.js b/src/controllers/music/musicalbums.js
index 67c4ac3b6a..6f11aaf10c 100644
--- a/src/controllers/music/musicalbums.js
+++ b/src/controllers/music/musicalbums.js
@@ -8,7 +8,7 @@ import cardBuilder from '../../components/cardbuilder/cardBuilder';
 import * as userSettings from '../../scripts/settings/userSettings';
 import globalize from '../../lib/globalize';
 import Events from '../../utils/events.ts';
-import { getFilterStatus, setFilterStatus } from 'components/filterdialog/filterIndicator';
+import { setFilterStatus } from 'components/filterdialog/filterIndicator';
 
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 
@@ -84,8 +84,7 @@ export default function (view, params, tabContent) {
         loading.show();
         isLoading = true;
         const query = getQuery();
-        const hasFilters = getFilterStatus(query);
-        setFilterStatus(tabContent, hasFilters);
+        setFilterStatus(tabContent, query);
 
         ApiClient.getItems(ApiClient.getCurrentUserId(), query).then((result) => {
             function onNextPageClick() {
diff --git a/src/controllers/music/musicartists.js b/src/controllers/music/musicartists.js
index 9c9856f42c..f48543ad22 100644
--- a/src/controllers/music/musicartists.js
+++ b/src/controllers/music/musicartists.js
@@ -6,7 +6,7 @@ import listView from '../../components/listview/listview';
 import cardBuilder from '../../components/cardbuilder/cardBuilder';
 import * as userSettings from '../../scripts/settings/userSettings';
 import Events from '../../utils/events.ts';
-import { getFilterStatus, setFilterStatus } from 'components/filterdialog/filterIndicator';
+import { setFilterStatus } from 'components/filterdialog/filterIndicator';
 
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 
@@ -68,8 +68,7 @@ export default function (view, params, tabContent, options) {
         loading.show();
         isLoading = true;
         const query = getQuery();
-        const hasFilters = getFilterStatus(query);
-        setFilterStatus(tabContent, hasFilters);
+        setFilterStatus(tabContent, query);
 
         const promise = options.mode == 'albumartists' ?
             ApiClient.getAlbumArtists(ApiClient.getCurrentUserId(), query) :
diff --git a/src/controllers/music/songs.js b/src/controllers/music/songs.js
index bbeea5ea60..bd2904ad07 100644
--- a/src/controllers/music/songs.js
+++ b/src/controllers/music/songs.js
@@ -8,7 +8,7 @@ import * as userSettings from '../../scripts/settings/userSettings';
 import globalize from '../../lib/globalize';
 import Dashboard from '../../utils/dashboard';
 import Events from '../../utils/events.ts';
-import { getFilterStatus, setFilterStatus } from 'components/filterdialog/filterIndicator';
+import { setFilterStatus } from 'components/filterdialog/filterIndicator';
 
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 
@@ -54,8 +54,7 @@ export default function (view, params, tabContent) {
         loading.show();
         isLoading = true;
         const query = getQuery();
-        const hasFilters = getFilterStatus(query);
-        setFilterStatus(tabContent, hasFilters);
+        setFilterStatus(tabContent, query);
 
         ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) {
             function onNextPageClick() {
diff --git a/src/controllers/shows/episodes.js b/src/controllers/shows/episodes.js
index 6b6b0386c2..3fdeefcda8 100644
--- a/src/controllers/shows/episodes.js
+++ b/src/controllers/shows/episodes.js
@@ -7,7 +7,7 @@ import * as userSettings from '../../scripts/settings/userSettings';
 import globalize from '../../lib/globalize';
 import Dashboard from '../../utils/dashboard';
 import Events from '../../utils/events.ts';
-import { getFilterStatus, setFilterStatus } from 'components/filterdialog/filterIndicator';
+import { setFilterStatus } from 'components/filterdialog/filterIndicator';
 
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 
@@ -70,8 +70,7 @@ export default function (view, params, tabContent) {
         loading.show();
         isLoading = true;
         const query = getQuery();
-        const hasFilters = getFilterStatus(query);
-        setFilterStatus(page, hasFilters);
+        setFilterStatus(page, query);
 
         ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) {
             function onNextPageClick() {
diff --git a/src/controllers/shows/tvshows.js b/src/controllers/shows/tvshows.js
index aa02d8df62..6ffdfa1dfd 100644
--- a/src/controllers/shows/tvshows.js
+++ b/src/controllers/shows/tvshows.js
@@ -7,7 +7,7 @@ import AlphaPicker from '../../components/alphaPicker/alphaPicker';
 import * as userSettings from '../../scripts/settings/userSettings';
 import globalize from '../../lib/globalize';
 import Events from '../../utils/events.ts';
-import { getFilterStatus, setFilterStatus } from 'components/filterdialog/filterIndicator';
+import { setFilterStatus } from 'components/filterdialog/filterIndicator';
 
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 
@@ -69,8 +69,7 @@ export default function (view, params, tabContent) {
         loading.show();
         isLoading = true;
         const query = getQuery();
-        const hasFilters = getFilterStatus(query);
-        setFilterStatus(page, hasFilters);
+        setFilterStatus(page, query);
 
         ApiClient.getItems(ApiClient.getCurrentUserId(), query).then((result) => {
             function onNextPageClick() {