diff --git a/wagtail/contrib/modeladmin/templates/modeladmin/create.html b/wagtail/contrib/modeladmin/templates/modeladmin/create.html
index 8d5bdd61b6..7a88fc811e 100644
--- a/wagtail/contrib/modeladmin/templates/modeladmin/create.html
+++ b/wagtail/contrib/modeladmin/templates/modeladmin/create.html
@@ -29,8 +29,10 @@
                 <ul>
                     <li class="actions">
                         {% block form_actions %}
-                            <div class="dropdown dropup match-width">
-                                <div><input type="submit" value="{% trans 'Save' %}" class="button" /></div>
+                            <div class="dropdown dropup dropdown-button match-width">
+                                <button type="submit" class="button action-save button-longrunning" tabindex="3" data-clicked-text="{% trans 'Saving...' %}">
+                                    <span class="icon icon-spinner"></span><em>{% trans 'Save' %}</em>
+                                </button>
                             </div>
                         {% endblock %}
                     </li>
diff --git a/wagtail/contrib/modeladmin/templates/modeladmin/edit.html b/wagtail/contrib/modeladmin/templates/modeladmin/edit.html
index a38d0805da..ca3c9068fa 100644
--- a/wagtail/contrib/modeladmin/templates/modeladmin/edit.html
+++ b/wagtail/contrib/modeladmin/templates/modeladmin/edit.html
@@ -4,13 +4,15 @@
 {% block form_action %}{{ view.edit_url }}{% endblock %}
 
 {% block form_actions %}
-    <div class="dropdown dropup match-width">
-        <div><input type="submit" value="{% trans 'Save' %}" /></div>
+    <div class="dropdown dropup dropdown-button match-width">
+        <button type="submit" class="button action-save button-longrunning" tabindex="3" data-clicked-text="{% trans 'Saving...' %}" {% if page.locked %}disabled {% endif %}>
+            <span class="icon icon-spinner"></span><em>{% trans 'Save' %}</em>
+        </button>
 
         {% if user_can_delete %}
             <div class="dropdown-toggle icon icon-arrow-up"></div>
             <ul role="menu">
-                <li><a href="{{ view.delete_url }}" class="button shortcut">{% trans "Delete" %}</a></li>
+                <li><a href="{{ view.delete_url }}" class="shortcut">{% trans "Delete" %}</a></li>
             </ul>
         {% endif %}