diff --git a/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/add.html b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/add.html
index d55f313fd..4c45926a9 100644
--- a/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/add.html
+++ b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/add.html
@@ -32,9 +32,11 @@
 {% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
 {% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 
     <script type="text/javascript">
diff --git a/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/edit.html b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/edit.html
index b58fd48b4..f749e6a06 100644
--- a/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/edit.html
+++ b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/edit.html
@@ -24,9 +24,11 @@
 {% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
 {% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 
     <script type="text/javascript">
diff --git a/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/index.html b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/index.html
index 3efd752b8..56e01fee3 100644
--- a/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/index.html
+++ b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/index.html
@@ -3,6 +3,7 @@
 {% block titletag %}{% trans "Search Terms" %}{% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     <script>
         window.headerSearch = {
             url: "{% url 'wagtailsearchpromotions:index' %}",
diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
index fa7eac9e4..e23b8b281 100644
--- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
@@ -2,6 +2,8 @@
 {% load wagtailadmin_tags compress i18n static gravatar %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailstyleguide/css/styleguide.css' %}" type="text/css" />
     {% endcompress %}
@@ -605,6 +607,8 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
+
     {% include "wagtailadmin/pages/_editor_js.html" %}
     <script>
         $(function(){
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
index 23f096caa..5c56d0eae 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
@@ -4,6 +4,8 @@
 {% block bodyclass %}login{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
     {% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html
index 54326736c..b7014608f 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html
@@ -4,6 +4,8 @@
 {% block bodyclass %}login{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
     {% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html
index 8a0d1e5b2..495006f1c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html
@@ -4,6 +4,8 @@
 {% block bodyclass %}login{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
     {% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html
index 26db15ea9..722327eff 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html
@@ -4,6 +4,8 @@
 {% block bodyclass %}login{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
     {% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home.html b/wagtail/wagtailadmin/templates/wagtailadmin/home.html
index 09b3cf1c3..f4a43b186 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home.html
@@ -4,6 +4,8 @@
 {% block bodyclass %}homepage{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/home.css' %}" type="text/css" />
     {% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/login.html b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
index 49061422e..d5acef41d 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/login.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
@@ -4,6 +4,8 @@
 {% block bodyclass %}login{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
     {% endcompress %}
@@ -64,6 +66,7 @@
 {% endblock %}
 
 {% block extra_js %}
+{{ block.super }}
 <script>
     $(function(){
         $('form input[name=username]').focus();
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/copy.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/copy.html
index d28726c18..6c9ccaefe 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/copy.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/copy.html
@@ -29,5 +29,6 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
index 998b8c52c..9e02e1845 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
@@ -64,9 +64,11 @@
 {% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
 {% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 
     <script>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
index 9efd8ac0b..edbcd49a9 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
@@ -93,8 +93,10 @@
 {% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
 {% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
index 8a24d9c05..7e1a2961b 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
@@ -22,6 +22,8 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
+
     {% comment %} modal-workflow is required by the view restrictions interface {% endcomment %}
     <script src="{% static 'wagtailadmin/js/modal-workflow.js' %}"></script>
     <script src="{% static 'wagtailadmin/js/privacy-switch.js' %}"></script>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html
index fb67df850..1b2bd061a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html
@@ -2,6 +2,8 @@
 {% load i18n %}
 {% block titletag %}{% trans 'Search' %}{% endblock %}
 {% block extra_js %}
+    {{ block.super }}
+
     <script>
         window.headerSearch = {
             url: "{% url 'wagtailadmin_pages:search' %}",
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
index 4cd4782a9..c70b19141 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
@@ -3,10 +3,12 @@
 {% load wagtailimages_tags %}
 {% block titletag %}{% trans "Add a document" %}{% endblock %}
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/shared/tag_field_css.html" %}
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/shared/tag_field_js.html" %}
 {% endblock %}
 
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
index 0109ee05c..2f0922376 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
@@ -3,10 +3,12 @@
 {% load wagtailimages_tags %}
 {% block titletag %}{% blocktrans with title=document.title %}Editing {{ title }}{% endblocktrans %}{% endblock %}
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/shared/tag_field_css.html" %}
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/shared/tag_field_js.html" %}
 {% endblock %}
 
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html
index b3305518b..ace43ca06 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html
@@ -2,6 +2,7 @@
 {% load i18n %}
 {% block titletag %}Documents{% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     <script>
         window.headerSearch = {
             url: "{% url 'wagtaildocs:index' %}",
diff --git a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
index 5354c9e01..10d7c0c08 100644
--- a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
+++ b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
@@ -2,6 +2,7 @@
 {% load i18n %}
 {% block titletag %}{% blocktrans with form_title=form_page.title|capfirst %}Submissions of {{ form_title }}{% endblocktrans %}{% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/shared/datetimepicker_translations.html" %}
 
     <script>
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/add.html b/wagtail/wagtailimages/templates/wagtailimages/images/add.html
index 5e72d4f77..9237ec185 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/add.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/add.html
@@ -3,10 +3,12 @@
 {% load i18n %}
 {% block titletag %}{% trans "Add an image" %}{% endblock %}
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/shared/tag_field_css.html" %}
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/shared/tag_field_js.html" %}
 {% endblock %}
 
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
index 74056f649..6452e412e 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
@@ -2,6 +2,8 @@
 {% load wagtailimages_tags compress static i18n %}
 {% block titletag %}{% blocktrans with title=image.title %}Editing image {{ title }}{% endblocktrans %}{% endblock %}
 {% block extra_css %}
+    {{ block.super }}
+
     {% include "wagtailadmin/shared/tag_field_css.html" %}
 
     <!-- Focal point chooser -->
@@ -12,6 +14,8 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
+
     {% include "wagtailadmin/shared/tag_field_js.html" %}
 
     <!-- Focal point chooser -->
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/index.html b/wagtail/wagtailimages/templates/wagtailimages/images/index.html
index 7f89b97ee..9c9989957 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/index.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/index.html
@@ -4,6 +4,7 @@
 
 {% block titletag %}{% trans "Images" %}{% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     <script>
         window.headerSearch = {
             url: "{% url 'wagtailimages:index' %}",
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html b/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html
index f2feffcb8..e72929c78 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html
@@ -35,6 +35,7 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% compress js %}
         <script src="{% static 'wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js' %}"></script>
         <script src="{% static 'wagtailimages/js/image-url-generator.js' %}"></script>
diff --git a/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html b/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
index 69d5c32de..85a099eea 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
@@ -2,6 +2,8 @@
 {% load wagtailimages_tags i18n compress static %}
 {% block titletag %}{% trans "Add multiple images" %}{% endblock %}
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailimages/css/add-multiple.css' %}" type="text/css" />
     {% endcompress %}
@@ -53,6 +55,8 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
+
     {% compress js %}
         <!-- this exact order of plugins is vital -->
         <script src="{% static 'wagtailimages/js/vendor/load-image.min.js' %}"></script>
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/add.html b/wagtail/wagtailredirects/templates/wagtailredirects/add.html
index 3921bbc7e..4fd2e9f8d 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/add.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/add.html
@@ -17,5 +17,6 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/edit.html b/wagtail/wagtailredirects/templates/wagtailredirects/edit.html
index a2de5136e..b25e9e488 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/edit.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/edit.html
@@ -18,5 +18,6 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/index.html b/wagtail/wagtailredirects/templates/wagtailredirects/index.html
index aeccf99e1..be6771f23 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/index.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/index.html
@@ -3,6 +3,7 @@
 {% block titletag %}{% trans "Redirects" %}{% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     <script>
         window.headerSearch = {
             url: "{% url 'wagtailredirects:index' %}",
diff --git a/wagtail/wagtailsites/templates/wagtailsites/create.html b/wagtail/wagtailsites/templates/wagtailsites/create.html
index df830c2af..dbef22db9 100644
--- a/wagtail/wagtailsites/templates/wagtailsites/create.html
+++ b/wagtail/wagtailsites/templates/wagtailsites/create.html
@@ -1,5 +1,6 @@
 {% extends "wagtailadmin/generic/create.html" %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
diff --git a/wagtail/wagtailsites/templates/wagtailsites/edit.html b/wagtail/wagtailsites/templates/wagtailsites/edit.html
index 14e9c29f0..1164d8b67 100644
--- a/wagtail/wagtailsites/templates/wagtailsites/edit.html
+++ b/wagtail/wagtailsites/templates/wagtailsites/edit.html
@@ -1,5 +1,6 @@
 {% extends "wagtailadmin/generic/edit.html" %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html
index aea94b1bf..08aadf20c 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html
@@ -23,8 +23,10 @@
 {% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
 {% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html
index 7c8239c88..4b0de17f4 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html
@@ -27,8 +27,10 @@
 {% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
 {% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/create.html b/wagtail/wagtailusers/templates/wagtailusers/groups/create.html
index b5712e589..802759fc4 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/groups/create.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/groups/create.html
@@ -4,6 +4,8 @@
 {% block titletag %}{% trans "Add group" %}{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailusers/css/groups_edit.css' %}" type="text/css" />
     {% endcompress %}
@@ -33,5 +35,6 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailusers/groups/includes/group_form_js.html" %}
 {% endblock %}
diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html b/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
index ddf76625a..c9cfee761 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
@@ -4,6 +4,7 @@
 {% block titletag %}{% trans "Editing" %} {{ group.name }}{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailusers/css/groups_edit.css' %}" type="text/css" />
     {% endcompress %}
@@ -41,5 +42,6 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailusers/groups/includes/group_form_js.html" %}
 {% endblock %}
diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/index.html b/wagtail/wagtailusers/templates/wagtailusers/groups/index.html
index 334f6c523..5ca4531d7 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/groups/index.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/groups/index.html
@@ -3,6 +3,7 @@
 {% load gravatar %}
 {% block titletag %}{% trans "groups" %}{% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     <script>
         window.headerSearch = {
             url: "{% url 'wagtailusers_groups:index' %}",
diff --git a/wagtail/wagtailusers/templates/wagtailusers/users/index.html b/wagtail/wagtailusers/templates/wagtailusers/users/index.html
index 8c982dc60..d2be62efb 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/users/index.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/users/index.html
@@ -3,6 +3,7 @@
 {% load gravatar %}
 {% block titletag %}{% trans "Users" %}{% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     <script>
         window.headerSearch = {
             url: "{% url 'wagtailusers_users:index' %}",