diff --git a/wagtail/admin/templates/wagtailadmin/generic/form.html b/wagtail/admin/templates/wagtailadmin/generic/form.html
index d27d3e0877..58f5a100a6 100644
--- a/wagtail/admin/templates/wagtailadmin/generic/form.html
+++ b/wagtail/admin/templates/wagtailadmin/generic/form.html
@@ -66,6 +66,9 @@
 
                     {% endblock %}
                 </nav>
+                {% block unsaved_changes_warning %}
+                    {% include "wagtailadmin/shared/unsaved_changes_warning.html" %}
+                {% endblock%}
             </footer>
         {% endblock %}
     </form>
diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/create.html b/wagtail/snippets/templates/wagtailsnippets/snippets/create.html
index 358cef24a3..7cffa1b8d6 100644
--- a/wagtail/snippets/templates/wagtailsnippets/snippets/create.html
+++ b/wagtail/snippets/templates/wagtailsnippets/snippets/create.html
@@ -10,11 +10,6 @@
     {% include 'wagtailadmin/shared/headers/slim_header.html' with breadcrumbs_items=breadcrumbs_items side_panels=side_panels history_url=history_url buttons=header_buttons %}
 {% endblock %}
 
-{% block footer %}
-    <footer class="footer w-grid md:w-grid-flow-col">
-        <nav class="actions actions--primary footer__container" aria-label="{% trans 'Actions' %}">
-            {{ action_menu.render_html }}
-        </nav>
-        {% include "wagtailadmin/shared/unsaved_changes_warning.html" %}
-    </footer>
+{% block actions %}
+    {{ action_menu.render_html }}
 {% endblock %}
diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/edit.html b/wagtail/snippets/templates/wagtailsnippets/snippets/edit.html
index ab9415b1c8..722207690c 100644
--- a/wagtail/snippets/templates/wagtailsnippets/snippets/edit.html
+++ b/wagtail/snippets/templates/wagtailsnippets/snippets/edit.html
@@ -11,13 +11,8 @@
     {% include 'wagtailadmin/shared/headers/slim_header.html' with breadcrumbs_items=breadcrumbs_items side_panels=side_panels history_url=history_url buttons=header_buttons %}
 {% endblock %}
 
-{% block footer %}
-    <footer class="footer w-grid md:w-grid-flow-col">
-        <nav class="actions actions--primary footer__container" aria-label="{% trans 'Actions' %}">
-            {{ action_menu.render_html }}
-        </nav>
-        {% include "wagtailadmin/shared/unsaved_changes_warning.html" %}
-    </footer>
+{% block actions %}
+    {{ action_menu.render_html }}
 {% endblock %}
 
 {% block extra_js %}