Index: branches/RC/core/admin_templates/js/uploader/upload_manager.js
===================================================================
diff -u -N -r11406 -r11418
--- branches/RC/core/admin_templates/js/uploader/upload_manager.js	(.../upload_manager.js)	(revision 11406)
+++ branches/RC/core/admin_templates/js/uploader/upload_manager.js	(.../upload_manager.js)	(revision 11418)
@@ -4,10 +4,6 @@
 			UploadsManager._initAll();
 		}
 	);
-
-	if (typeof Application != 'undefined') {
-		Application.setHook('m:OnAfterFormInit', UploadsManager.setScrollEvents);
-	}
 }
 
 UploadsManager = new UploadsManager();
@@ -100,6 +96,15 @@
 }
 
 UploadsManager._createHooks = function () {
+	if (typeof Application != 'undefined') {
+		Application.setHook(
+			'm:OnAfterFormInit',
+			function () {
+				UploadsManager.setScrollEvents();
+			}
+		);
+	}
+
 	// hooking to standard toolbar select button to peform auto-upload when Save is clicked
 	if (!UploadsManager.useToolbar || !isset(a_toolbar)) {
 		return ;