diff --git a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js
index 961f690a68e..220c942dee4 100644
--- a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js
+++ b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js
@@ -46,9 +46,9 @@ export default Mixin.create({
   _unbindUploadTarget() {
     this.messageBus.unsubscribe("/uploads/composer");
 
-    this.uploadButton?.removeEventListener(
+    this.mobileUploadButton?.removeEventListener(
       "click",
-      this.uploadButtonEventListener
+      this.mobileUploadButtonEventListener
     );
 
     this.fileInputEl?.removeEventListener(
@@ -375,29 +375,28 @@ export default Mixin.create({
   },
 
   _bindPasteListener() {
-    this.pasteEventListener = this.element.addEventListener(
-      "paste",
-      (event) => {
-        if (
-          document.activeElement !== document.querySelector(".d-editor-input")
-        ) {
-          return;
-        }
-
-        const { canUpload } = clipboardHelpers(event, {
-          siteSettings: this.siteSettings,
-          canUpload: true,
-        });
-
-        if (!canUpload) {
-          return;
-        }
-
-        if (event && event.clipboardData && event.clipboardData.files) {
-          this._addFiles([...event.clipboardData.files]);
-        }
+    this.pasteEventListener = function pasteListener(event) {
+      if (
+        document.activeElement !== document.querySelector(".d-editor-input")
+      ) {
+        return;
       }
-    );
+
+      const { canUpload } = clipboardHelpers(event, {
+        siteSettings: this.siteSettings,
+        canUpload: true,
+      });
+
+      if (!canUpload) {
+        return;
+      }
+
+      if (event && event.clipboardData && event.clipboardData.files) {
+        this._addFiles([...event.clipboardData.files]);
+      }
+    }.bind(this);
+
+    this.element.addEventListener("paste", this.pasteEventListener);
   },
 
   _addFiles(files) {
diff --git a/app/assets/javascripts/discourse/app/mixins/composer-upload.js b/app/assets/javascripts/discourse/app/mixins/composer-upload.js
index 5dbbbb94a66..bec49443cde 100644
--- a/app/assets/javascripts/discourse/app/mixins/composer-upload.js
+++ b/app/assets/javascripts/discourse/app/mixins/composer-upload.js
@@ -333,10 +333,13 @@ export default Mixin.create({
 
   _bindMobileUploadButton() {
     if (this.site.mobileView) {
-      this.uploadButton = document.getElementById("mobile-file-upload");
-      this.uploadButtonEventListener = this.uploadButton.addEventListener(
+      this.mobileUploadButton = document.getElementById("mobile-file-upload");
+      this.mobileUploadButtonEventListener = function mobileButtonEventListener() {
+        document.getElementById("file-uploader").click();
+      };
+      this.mobileUploadButton.addEventListener(
         "click",
-        () => document.getElementById("file-uploader").click(),
+        this.mobileUploadButtonEventListener,
         false
       );
     }
@@ -344,9 +347,9 @@ export default Mixin.create({
 
   @on("willDestroyElement")
   _unbindUploadTarget() {
-    this.uploadButton?.removeEventListener(
+    this.mobileUploadButton?.removeEventListener(
       "click",
-      this.uploadButtonEventListener
+      this.mobileUploadButtonEventListener
     );
 
     this._validUploads = 0;