diff --git a/CHANGES.txt b/CHANGES.txt
index e92afc10..71c94ce1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,7 @@ Change History
 1.8.5 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Only load quickedit resources on quickedit view.
 
 
 1.8.4 (2017-07-08)
diff --git a/Products/PloneFormGen/profiles/default/registry.xml b/Products/PloneFormGen/profiles/default/registry.xml
index 106ddb1d..20dec8da 100644
--- a/Products/PloneFormGen/profiles/default/registry.xml
+++ b/Products/PloneFormGen/profiles/default/registry.xml
@@ -20,7 +20,7 @@
         <value key="resources">
             <element>pfgquickedit</element>
         </value>
-        <value key="expression">python: object.portal_type == 'FormFolder' and member is not None</value>
+        <value key="expression">python: object.portal_type == 'FormFolder' and member is not None and 'quickedit' in request.URL</value>
         <value key="enabled">True</value>
         <value key="compile">False</value>
         <value key="jscompilation">++plone++pfgquickedit/quickedit-min.js</value>
@@ -29,4 +29,4 @@
         <value key="last_compilation">2015-05-28 00:00:00</value>
     </records>
 
-</registry>
\ No newline at end of file
+</registry>