diff --git a/src/Controller/Admin/ActivityController.php b/src/Controller/Admin/ActivityController.php
index fd8b1da2e..ca933d1da 100644
--- a/src/Controller/Admin/ActivityController.php
+++ b/src/Controller/Admin/ActivityController.php
@@ -61,6 +61,7 @@ class ActivityController extends AbstractController
         return $this->render('admin/activity.html.twig', [
             'entries' => $entries,
             'query' => $query,
+            'showFilter' => $form->isSubmitted(),
             'toolbarForm' => $form->createView(),
         ]);
     }
diff --git a/src/Controller/Admin/CustomerController.php b/src/Controller/Admin/CustomerController.php
index 3fe061a27..c667f0977 100644
--- a/src/Controller/Admin/CustomerController.php
+++ b/src/Controller/Admin/CustomerController.php
@@ -71,6 +71,7 @@ class CustomerController extends AbstractController
         return $this->render('admin/customer.html.twig', [
             'entries' => $entries,
             'query' => $query,
+            'showFilter' => $form->isSubmitted(),
             'toolbarForm' => $form->createView(),
         ]);
     }
diff --git a/src/Controller/Admin/ProjectController.php b/src/Controller/Admin/ProjectController.php
index 536c2fe48..cf3948e48 100644
--- a/src/Controller/Admin/ProjectController.php
+++ b/src/Controller/Admin/ProjectController.php
@@ -62,6 +62,7 @@ class ProjectController extends AbstractController
         return $this->render('admin/project.html.twig', [
             'entries' => $entries,
             'query' => $query,
+            'showFilter' => $form->isSubmitted(),
             'toolbarForm' => $form->createView(),
         ]);
     }
diff --git a/src/Controller/Admin/TimesheetController.php b/src/Controller/Admin/TimesheetController.php
index c9cab2c7e..6a0137d2d 100644
--- a/src/Controller/Admin/TimesheetController.php
+++ b/src/Controller/Admin/TimesheetController.php
@@ -75,6 +75,7 @@ class TimesheetController extends AbstractController
             'entries' => $entries,
             'page' => $page,
             'query' => $query,
+            'showFilter' => $form->isSubmitted(),
             'toolbarForm' => $form->createView(),
         ]);
     }
diff --git a/src/Controller/Admin/UserController.php b/src/Controller/Admin/UserController.php
index 10e9003cc..8eb428e66 100644
--- a/src/Controller/Admin/UserController.php
+++ b/src/Controller/Admin/UserController.php
@@ -77,6 +77,7 @@ class UserController extends AbstractController
         return $this->render('admin/user.html.twig', [
             'entries' => $entries,
             'query' => $query,
+            'showFilter' => $form->isSubmitted(),
             'toolbarForm' => $form->createView(),
         ]);
     }
diff --git a/src/Controller/TimesheetController.php b/src/Controller/TimesheetController.php
index d315dbf09..b0421f8dd 100644
--- a/src/Controller/TimesheetController.php
+++ b/src/Controller/TimesheetController.php
@@ -74,6 +74,7 @@ class TimesheetController extends AbstractController
             'entries' => $entries,
             'page' => $page,
             'query' => $query,
+            'showFilter' => $form->isSubmitted(),
             'toolbarForm' => $form->createView(),
         ]);
     }
diff --git a/templates/admin/activity.html.twig b/templates/admin/activity.html.twig
index 111a40af3..a20ecb045 100644
--- a/templates/admin/activity.html.twig
+++ b/templates/admin/activity.html.twig
@@ -8,7 +8,7 @@
 {% block page_actions %}{{ widgets.page_actions({'filter': '#collapseActivityAdmin', 'visibility': '#modal_activity_admin', 'create': path('admin_activity_create')}) }}{% endblock %}
 
 {% block main_before %}
-    {{ toolbar.toolbar(toolbarForm, 'collapseActivityAdmin') }}
+    {{ toolbar.toolbar(toolbarForm, 'collapseActivityAdmin', showFilter) }}
 {% endblock %}
 
 {% block main %}
diff --git a/templates/admin/customer.html.twig b/templates/admin/customer.html.twig
index 99c2e37b9..3ffb98d0b 100644
--- a/templates/admin/customer.html.twig
+++ b/templates/admin/customer.html.twig
@@ -8,7 +8,7 @@
 {% block page_actions %}{{ widgets.page_actions({'filter': '#collapseCustomerAdmin', 'visibility': '#modal_customer_admin', 'create': path('admin_customer_create')}) }}{% endblock %}
 
 {% block main_before %}
-    {{ toolbar.toolbar(toolbarForm, 'collapseCustomerAdmin') }}
+    {{ toolbar.toolbar(toolbarForm, 'collapseCustomerAdmin', showFilter) }}
 {% endblock %}
 
 {% block main %}
diff --git a/templates/admin/project.html.twig b/templates/admin/project.html.twig
index 7bcf0b5b3..f32e8fddb 100644
--- a/templates/admin/project.html.twig
+++ b/templates/admin/project.html.twig
@@ -8,7 +8,7 @@
 {% block page_actions %}{{ widgets.page_actions({'filter': '#collapseProjectAdmin', 'visibility': '#modal_project_admin', 'create': path('admin_project_create')}) }}{% endblock %}
 
 {% block main_before %}
-    {{ toolbar.toolbar(toolbarForm, 'collapseProjectAdmin') }}
+    {{ toolbar.toolbar(toolbarForm, 'collapseProjectAdmin', showFilter) }}
 {% endblock %}
 
 {% block main %}
diff --git a/templates/admin/timesheet.html.twig b/templates/admin/timesheet.html.twig
index c8a26c8cb..c1478d003 100644
--- a/templates/admin/timesheet.html.twig
+++ b/templates/admin/timesheet.html.twig
@@ -8,7 +8,7 @@
 {% block page_actions %}{{ widgets.page_actions({'filter': '#collapseTimesheetAdmin', 'visibility': '#modal_timesheet_admin', 'create': path('admin_timesheet_create')}) }}{% endblock %}
 
 {% block main_before %}
-    {{ toolbar.toolbar(toolbarForm, 'collapseTimesheetAdmin') }}
+    {{ toolbar.toolbar(toolbarForm, 'collapseTimesheetAdmin', showFilter) }}
 {% endblock %}
 
 {% block main %}
diff --git a/templates/admin/user.html.twig b/templates/admin/user.html.twig
index 4be20fcc5..166aafd5f 100644
--- a/templates/admin/user.html.twig
+++ b/templates/admin/user.html.twig
@@ -8,7 +8,7 @@
 {% block page_actions %}{{ widgets.page_actions({'filter': '#collapseUserAdmin', 'visibility': '#modal_user_admin', 'create': path('admin_user_create')}) }}{% endblock %}
 
 {% block main_before %}
-    {{ toolbar.toolbar(toolbarForm, 'collapseUserAdmin') }}
+    {{ toolbar.toolbar(toolbarForm, 'collapseUserAdmin', showFilter) }}
 {% endblock %}
 
 {% block main %}
diff --git a/templates/timesheet/index.html.twig b/templates/timesheet/index.html.twig
index fb3cab9ef..02df5055e 100644
--- a/templates/timesheet/index.html.twig
+++ b/templates/timesheet/index.html.twig
@@ -8,7 +8,7 @@
 {% block page_actions %}{{ widgets.page_actions({'filter': '#collapseTimesheet', 'download': 'onclick:return exportTimesheet()', 'visibility': '#modal_timesheet', 'calendar': path('calendar'), 'create': path('timesheet_create')}) }}{% endblock %}
 
 {% block main_before %}
-    {{ toolbar.toolbar(toolbarForm, 'collapseTimesheet') }}
+    {{ toolbar.toolbar(toolbarForm, 'collapseTimesheet', showFilter) }}
 {% endblock %}
 
 {% block main %}