diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ecc6d9ef2..aa0437b21 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -14,6 +14,7 @@ Changelog
  * Fix: When editing a document link in rich text, the document ID is no longer erroneously interpreted as a page ID (Stephen Rice)
  * Fix: Removing embedded media from rich text by mouse click action now gets correctly registered as a change to the field (Loic Teixeira)
  * Fix: Rich text editor is no longer broken in InlinePanels (Matt Westcott, Yann Fouillat)
+ * Fix: Rich text editor is no longer broken in settings (Matt Westcott)
 
 
 1.5 (31.05.2016)
diff --git a/docs/releases/1.5.1.rst b/docs/releases/1.5.1.rst
index 48bb08d97..73e8ab364 100644
--- a/docs/releases/1.5.1.rst
+++ b/docs/releases/1.5.1.rst
@@ -17,3 +17,4 @@ Bug fixes
  * When editing a document link in rich text, the document ID is no longer erroneously interpreted as a page ID (Stephen Rice)
  * Removing embedded media from rich text by mouse click action now gets correctly registered as a change to the field (Loic Teixeira)
  * Rich text editor is no longer broken in InlinePanels (Matt Westcott, Yann Fouillat)
+ * Rich text editor is no longer broken in settings (Matt Westcott)
diff --git a/wagtail/contrib/settings/templates/wagtailsettings/edit.html b/wagtail/contrib/settings/templates/wagtailsettings/edit.html
index f6bff41a3..aca58e6ee 100644
--- a/wagtail/contrib/settings/templates/wagtailsettings/edit.html
+++ b/wagtail/contrib/settings/templates/wagtailsettings/edit.html
@@ -43,11 +43,9 @@
 
 {% block extra_css %}
     {% include "wagtailadmin/pages/_editor_css.html" %}
-    {{ form.media.css }}
     {{ site_switcher.media.css }}
 {% endblock %}
 {% block extra_js %}
     {% include "wagtailadmin/pages/_editor_js.html" %}
-    {{ form.media.js }}
     {{ site_switcher.media.js }}
 {% endblock %}