diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a54af4e6af..eda5ecdc4e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -27,6 +27,7 @@ Changelog
  * Fix: Ensure HTML title is populated on project template 404 page (Matt Westcott)
  * Fix: Respect cache_age parameters on embeds (Gordon Pendleton)
  * Fix: Page comparison view now reflects request-level customisations to edit handlers (Matt Westcott)
+ * Fix: Add `block.super` to remaining `extra_js` & `extra_css` blocks (Andrew Stone)
 
 
 2.13.3 (05.07.2021)
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 6105731911..4f779a3f38 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -520,6 +520,7 @@ Contributors
 * Godswill Melford
 * Jake Howard
 * Petr Dlouhý
+* Andrew Stone
 
 Translators
 ===========
diff --git a/docs/releases/2.14.rst b/docs/releases/2.14.rst
index 7940cecd64..4352c20e64 100644
--- a/docs/releases/2.14.rst
+++ b/docs/releases/2.14.rst
@@ -38,6 +38,7 @@ Bug fixes
  * Ensure HTML title is populated on project template 404 page (Matt Westcott)
  * Respect cache_age parameters on embeds (Gordon Pendleton)
  * Page comparison view now reflects request-level customisations to edit handlers (Matt Westcott)
+ * Add ``block.super`` to remaining ``extra_js`` & ``extra_css`` blocks (Andrew Stone)
 
 Upgrade considerations
 ======================
diff --git a/wagtail/admin/templates/wagtailadmin/account/account.html b/wagtail/admin/templates/wagtailadmin/account/account.html
index b6d0f35df3..89d8d30c3f 100644
--- a/wagtail/admin/templates/wagtailadmin/account/account.html
+++ b/wagtail/admin/templates/wagtailadmin/account/account.html
@@ -64,6 +64,7 @@
 {% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
     <link rel="stylesheet" href="{% versioned_static 'wagtailadmin/css/layouts/account.css' %}" type="text/css" />
     {{ media.css }}
diff --git a/wagtail/admin/templates/wagtailadmin/home.html b/wagtail/admin/templates/wagtailadmin/home.html
index c58b044cec..b44a0d2cb7 100644
--- a/wagtail/admin/templates/wagtailadmin/home.html
+++ b/wagtail/admin/templates/wagtailadmin/home.html
@@ -33,6 +33,7 @@
 {% endblock %}
 
 {% block extra_js %}
+{{ block.super }}
 <script>
 $(function() {
     $('.object.collapsible').each(function() {
diff --git a/wagtail/admin/templates/wagtailadmin/reports/base_report.html b/wagtail/admin/templates/wagtailadmin/reports/base_report.html
index 11a44623bd..eda58af787 100644
--- a/wagtail/admin/templates/wagtailadmin/reports/base_report.html
+++ b/wagtail/admin/templates/wagtailadmin/reports/base_report.html
@@ -56,11 +56,13 @@
 {% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     <link rel="stylesheet" href="{% versioned_static 'wagtailadmin/css/layouts/report.css' %}" type="text/css" />
 
     {{ filters.form.media.css }}
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {{ filters.form.media.js }}
 {% endblock %}
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/create.html b/wagtail/admin/templates/wagtailadmin/workflows/create.html
index 48c1baa427..467505be83 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/create.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/create.html
@@ -4,6 +4,7 @@
 {% block titletag %}{{ view.page_title }}{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
     <link rel="stylesheet" href="{% versioned_static 'wagtailadmin/css/layouts/workflow-edit.css' %}" type="text/css" />
     {{ edit_handler.form.media.css }}
@@ -13,6 +14,7 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
     {{ edit_handler.form.media.js }}
     {{ pages_formset.media.js }}
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/create_task.html b/wagtail/admin/templates/wagtailadmin/workflows/create_task.html
index 4cb55f257e..c984af934c 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/create_task.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/create_task.html
@@ -4,6 +4,7 @@
 {% block titletag %}{{ view.page_title }}{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
     {{ edit_handler.form.media.css }}
 
@@ -11,6 +12,7 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
     {{ edit_handler.form.media.js }}
     {{ edit_handler.html_declarations }}
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/edit.html b/wagtail/admin/templates/wagtailadmin/workflows/edit.html
index 5d725dbfca..384090efb6 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/edit.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/edit.html
@@ -4,6 +4,7 @@
 {% block titletag %}{{ view.page_title }}{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
     {{ edit_handler.form.media.css }}
     {{ pages_formset.media.css }}
@@ -13,6 +14,7 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
     {{ edit_handler.form.media.js }}
     {{ pages_formset.media.js }}
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/edit_task.html b/wagtail/admin/templates/wagtailadmin/workflows/edit_task.html
index 706d9da70b..85a0620e55 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/edit_task.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/edit_task.html
@@ -4,6 +4,7 @@
 {% block titletag %}{{ view.page_title }}{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
     {{ edit_handler.form.media.css }}
 
@@ -11,6 +12,7 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
     {{ edit_handler.form.media.js }}
     {{ edit_handler.html_declarations }}