diff --git a/activestorage/app/assets/javascripts/activestorage.esm.js b/activestorage/app/assets/javascripts/activestorage.esm.js
index a8b46801f2d13..e6d60e64a6f2e 100644
--- a/activestorage/app/assets/javascripts/activestorage.esm.js
+++ b/activestorage/app/assets/javascripts/activestorage.esm.js
@@ -771,9 +771,9 @@ function start() {
 }
 
 function didClick(event) {
-  const submitButton = event.target.closest(":is(button, input)[type='submit']");
-  if (submitButton && submitButton.form) {
-    submitButtonsByForm.set(submitButton.form, submitButton);
+  const button = event.target.closest("button, input");
+  if (button && button.type === "submit" && button.form) {
+    submitButtonsByForm.set(button.form, button);
   }
 }
 
diff --git a/activestorage/app/assets/javascripts/activestorage.js b/activestorage/app/assets/javascripts/activestorage.js
index 1ca800e44c72c..a31bf08fbf433 100644
--- a/activestorage/app/assets/javascripts/activestorage.js
+++ b/activestorage/app/assets/javascripts/activestorage.js
@@ -754,9 +754,9 @@
     }
   }
   function didClick(event) {
-    const submitButton = event.target.closest(":is(button, input)[type='submit']");
-    if (submitButton && submitButton.form) {
-      submitButtonsByForm.set(submitButton.form, submitButton);
+    const button = event.target.closest("button, input");
+    if (button && button.type === "submit" && button.form) {
+      submitButtonsByForm.set(button.form, button);
     }
   }
   function didSubmitForm(event) {
diff --git a/activestorage/app/javascript/activestorage/ujs.js b/activestorage/app/javascript/activestorage/ujs.js
index e8d5861a2a00f..6f268056a5373 100644
--- a/activestorage/app/javascript/activestorage/ujs.js
+++ b/activestorage/app/javascript/activestorage/ujs.js
@@ -15,9 +15,9 @@ export function start() {
 }
 
 function didClick(event) {
-  const submitButton = event.target.closest(":is(button, input)[type='submit']")
-  if (submitButton && submitButton.form) {
-    submitButtonsByForm.set(submitButton.form, submitButton)
+  const button = event.target.closest("button, input")
+  if (button && button.type === "submit" && button.form) {
+    submitButtonsByForm.set(button.form, button)
   }
 }