diff --git a/src/unfold/templates/admin/base.html b/src/unfold/templates/admin/base.html
index 5cac3306..2cea880b 100644
--- a/src/unfold/templates/admin/base.html
+++ b/src/unfold/templates/admin/base.html
@@ -40,6 +40,10 @@
 
             <div class="px-4 pb-4 grow">
                 <div id="content" class="{% if not cl.model_admin.list_fullwidth %}container{% endif %} mx-auto {% block coltype %}colM{% endblock %}">
+
+                    {% include "unfold/helpers/messages/errornote.html" with errors=errors %}
+                    {% include "unfold/helpers/messages/error.html" with errors=adminform.form.non_field_errors %}
+
                     {% if cl %}
                         {% tab_list "changelist" cl.opts %}
                     {% elif opts %}
diff --git a/src/unfold/templates/admin/change_form.html b/src/unfold/templates/admin/change_form.html
index 1ffd246f..90122310 100644
--- a/src/unfold/templates/admin/change_form.html
+++ b/src/unfold/templates/admin/change_form.html
@@ -85,9 +85,6 @@
                     <input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}">
                 {% endif %}
 
-                {% include "unfold/helpers/messages/errornote.html" with errors=errors %}
-                {% include "unfold/helpers/messages/error.html" with errors=adminform.form.non_field_errors %}
-
                 {% block field_sets %}
                     {% with has_conditional_display=adminform.model_admin.conditional_fields %}
                         {% for fieldset in adminform %}