diff --git a/wagtail/admin/templates/wagtailadmin/generic/edit.html b/wagtail/admin/templates/wagtailadmin/generic/edit.html
index b3669821d9..cf17398252 100644
--- a/wagtail/admin/templates/wagtailadmin/generic/edit.html
+++ b/wagtail/admin/templates/wagtailadmin/generic/edit.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block actions %}
-    <input type="submit" value="{% trans 'Save' %}" class="button" />
+    {{ block.super }}
     {% if delete_url %}
         <a href="{{ delete_url }}" class="button no">{{ delete_item_label }}</a>
     {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/generic/form.html b/wagtail/admin/templates/wagtailadmin/generic/form.html
index f998c48206..a034b21f65 100644
--- a/wagtail/admin/templates/wagtailadmin/generic/form.html
+++ b/wagtail/admin/templates/wagtailadmin/generic/form.html
@@ -24,13 +24,11 @@
                     </li>
                 {% endfor %}
             {% endblock %}
-
-            <li>
-                {% block actions %}
-                    <input type="submit" value="{{ submit_button_label }}" class="button" />
-                {% endblock %}
-            </li>
         </ul>
+
+        {% block actions %}
+            <button type="submit" class="button">{{ submit_button_label }}</button>
+        {% endblock %}
     </form>
 {% endblock %}