diff --git a/actiontext/app/assets/javascripts/actiontext.esm.js b/actiontext/app/assets/javascripts/actiontext.esm.js
index 2a3fad67a3..2f433b7f0a 100644
--- a/actiontext/app/assets/javascripts/actiontext.esm.js
+++ b/actiontext/app/assets/javascripts/actiontext.esm.js
@@ -771,9 +771,9 @@ function start() {
 }
 
 function didClick(event) {
-  const {target: target} = event;
-  if ((target.tagName == "INPUT" || target.tagName == "BUTTON") && target.type == "submit" && target.form) {
-    submitButtonsByForm.set(target.form, target);
+  const button = event.target.closest("button, input");
+  if (button && button.type === "submit" && button.form) {
+    submitButtonsByForm.set(button.form, button);
   }
 }
 
diff --git a/actiontext/app/assets/javascripts/actiontext.js b/actiontext/app/assets/javascripts/actiontext.js
index a89f5ec3ef..ef283f2757 100644
--- a/actiontext/app/assets/javascripts/actiontext.js
+++ b/actiontext/app/assets/javascripts/actiontext.js
@@ -753,9 +753,9 @@
     }
   }
   function didClick(event) {
-    const {target: target} = event;
-    if ((target.tagName == "INPUT" || target.tagName == "BUTTON") && target.type == "submit" && target.form) {
-      submitButtonsByForm.set(target.form, target);
+    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/actiontext/package.json b/actiontext/package.json
index eb6af4e5a9..1d9134927e 100644
--- a/actiontext/package.json
+++ b/actiontext/package.json
@@ -22,7 +22,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@rails/activestorage": ">= 7.1.0-alpha"
+    "@rails/activestorage": ">= 8.0.0-alpha"
   },
   "peerDependencies": {
     "trix": "^2.0.0"
diff --git a/yarn.lock b/yarn.lock
index 7194c4865d..ab456d3cf6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -105,13 +105,6 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@rails/activestorage@>= 7.1.0-alpha":
-  version "7.1.0-beta1"
-  resolved "https://registry.npmjs.org/@rails/activestorage/-/activestorage-7.1.0-beta1.tgz"
-  integrity sha512-5qQ5/65tBOVeFMgGq8F+PhXKrmBLMAnVpyZAe8WsCW5DbINRD8l8ysA8+zBmwCIxBMqn+M9hZoQVjuMPr35bvQ==
-  dependencies:
-    spark-md5 "^3.0.1"
-
 "@rollup/plugin-commonjs@^19.0.1":
   version "19.0.2"
   resolved "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-19.0.2.tgz"