diff --git a/docs/en/04_Changelogs/4.0.0.md b/docs/en/04_Changelogs/4.0.0.md
index 9b6baf23b..3eac4e4b2 100644
--- a/docs/en/04_Changelogs/4.0.0.md
+++ b/docs/en/04_Changelogs/4.0.0.md
@@ -9,6 +9,7 @@
  * `DataObject::database_fields` now returns all fields on that table.
  * `DataObject::db` now returns composite fields.
  * `DataObject::ClassName` field has been refactored into a `DBClassName` type field.
+ * `CMSFileAddController` removed.
 
 ## Upgrading
 
diff --git a/javascript/UploadField.js b/javascript/UploadField.js
index 5973cd9a6..3fdc3ea69 100644
--- a/javascript/UploadField.js
+++ b/javascript/UploadField.js
@@ -256,7 +256,7 @@
 				this._super();
 			},
 			onunmatch: function() {
-				$dropZone.off('dragover dragenter dragleave drop');
+				$('.ss-uploadfield-dropzone').off('dragover dragenter dragleave drop');
 				this._super();
 			},
 			openSelectDialog: function(uploadedFile) {