diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7e26d807b..6557ff5c32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 
 - #3471 - EmailService not working due to unsatisfied reference to MailTemplateManager in AEM on prem
 - #3497 - Redirect Manager: allow creating redirect configurations in a nested hierarchy
+- #3522 - Fix fontIconPicker javascript
 
 ## 6.9.10 - 2024-12-13
 
diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/touchui-widgets/icon-picker/source/icon-picker.js b/ui.apps/src/main/content/jcr_root/apps/acs-commons/touchui-widgets/icon-picker/source/icon-picker.js
index 4ac941f3db..a0814f4a67 100644
--- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/touchui-widgets/icon-picker/source/icon-picker.js
+++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/touchui-widgets/icon-picker/source/icon-picker.js
@@ -17,8 +17,10 @@
  * limitations under the License.
  * #L%
  */
-$(document).on('cui-contentloaded.data-api', function (e) {
-    $('[data-init~=graphiciconselect] > select').fontIconPicker({
-        'theme' : 'fip-coral'
+(function($, $document) {
+    $(document).on('cui-contentloaded.data-api', function (e) {
+        $('[data-init~=graphiciconselect] > select').fontIconPicker({
+            'theme' : 'fip-coral'
+        });
     });
-});
\ No newline at end of file
+}(jQuery, jQuery(document)));
\ No newline at end of file