diff --git a/CHANGES.txt b/CHANGES.txt
index 6a09b7b..7079ef0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,8 @@ Changelog
 ------------------
 
 - Simplify CSS and JS registrations. CSS will now be imported using the
-  standard link and so can be merged, inserted after forms.css.
+  standard link and so can be merged, inserted after forms.css. JS will now be
+  imported after collapsibleformfields.js.
   [elro]
 
 - Enable the left-menu on the configlet, to be more consistent with all other configlets.
diff --git a/plone/app/discussion/profiles/default/jsregistry.xml b/plone/app/discussion/profiles/default/jsregistry.xml
index 6f1e65e..db55b25 100644
--- a/plone/app/discussion/profiles/default/jsregistry.xml
+++ b/plone/app/discussion/profiles/default/jsregistry.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
 <object name="portal_javascripts">
- <javascript id="++resource++plone.app.discussion.javascripts/comments.js"/>
+ <javascript
+     id="++resource++plone.app.discussion.javascripts/comments.js"
+     insert-after="collapsibleformfields.js"
+     />
 </object>