diff --git a/CHANGES.md b/CHANGES.md
index 3f04e4d9..a09b0490 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,8 @@
 - Fix: Misspelling for `dropXMLInternalSubset` method (also fixes
     use in imagelib when defaulting to image's title)
 - Fix: Redirect paths for imagelib redirect checks
+- Fix: Ensure `setupCurPrefs` is run (including when `source` or
+    `url` is set within the URL)
 - Optimization: Remove unused `jquery-ui-1.8.custom.min.js` file
 - Localization: Add 'SVG-Edit Home Page' to locale files
 - Refactoring: Switch from `$.param.querystring` to `URL`
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index 8a5c1a53..4a511e8d 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -521,7 +521,7 @@ editor.setConfig = function (opts, cfgCfg) {
     if (!{}.hasOwnProperty.call(opts, key)) {
       return;
     }
-    // Only allow prefs defined in defaultPrefs
+    // Only allow prefs defined in defaultPrefs or...
     if ({}.hasOwnProperty.call(defaultPrefs, key)) {
       if (cfgCfg.overwrite === false && (
         curConfig.preventAllURLConfig ||
@@ -792,8 +792,8 @@ editor.init = function () {
       setupCurConfig();
       editor.loadContentAndPrefs();
     }
-    setupCurPrefs();
   })();
+  setupCurPrefs();
 
   /**
   * Called internally.