diff --git a/src/unfold/templates/admin/change_list.html b/src/unfold/templates/admin/change_list.html
index c98dadb5..0e0f06d1 100644
--- a/src/unfold/templates/admin/change_list.html
+++ b/src/unfold/templates/admin/change_list.html
@@ -82,24 +82,28 @@
{% endif %}
{% block result_list %}
- {% if action_form and actions_on_top and cl.show_admin_actions %}
-
- {% block search %}
- {% search_form cl %}
- {% endblock %}
-
- {% admin_actions %}
+ {% if actions_on_top %}
+ {% if cl.search_fields or action_form or cl.has_filters %}
+
+ {% block search %}
+ {% search_form cl %}
+ {% endblock %}
+
+ {% if action_form %}
+ {% admin_actions %}
+ {% endif %}
- {% block filters %}
- {% if cl.has_filters %}
-
+
filter_list
+
+ {% endif %}
+ {% endblock %}
+
+ {% endif %}
{% endif %}
{% unfold_result_list cl %}