diff --git a/.github/workflows/ci-semver.yml b/.github/workflows/ci-semver.yml
index f5d7567024..572d575312 100644
--- a/.github/workflows/ci-semver.yml
+++ b/.github/workflows/ci-semver.yml
@@ -15,7 +15,7 @@ jobs:
   test:
     needs: [get-leptos-changed]
     if: needs.get-leptos-changed.outputs.leptos_changed == 'true'
-    name: Run semver check (nightly-2024-03-31)
+    name: Run semver check (nightly-2024-04-14)
     runs-on: ubuntu-latest
 
     steps:
@@ -25,4 +25,4 @@ jobs:
       - name: Semver Checks
         uses: obi1kenobi/cargo-semver-checks-action@v2
         with:
-          rust-toolchain: nightly-2024-03-31
+          rust-toolchain: nightly-2024-04-14
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 00434b8d0b..b5810ead2c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,4 +40,4 @@ jobs:
     with:
       directory: ${{ matrix.directory }}
       cargo_make_task: "ci"
-      toolchain: nightly-2024-03-31
+      toolchain: nightly-2024-04-14
diff --git a/leptos_macro/Makefile.toml b/leptos_macro/Makefile.toml
index 4a32f30846..b504b912a1 100644
--- a/leptos_macro/Makefile.toml
+++ b/leptos_macro/Makefile.toml
@@ -11,13 +11,13 @@ dependencies = [
 [tasks.test-leptos_macro-example]
 description = "Tests the leptos_macro/example to check if macro handles doc comments correctly"
 command = "cargo"
-args = ["+nightly-2024-03-31", "test", "--doc"]
+args = ["+nightly-2024-04-14", "test", "--doc"]
 cwd = "example"
 install_crate = false
 
 [tasks.doc-leptos_macro-example]
 description = "Docs the leptos_macro/example to check if macro handles doc comments correctly"
 command = "cargo"
-args = ["+nightly-2024-03-31", "doc"]
+args = ["+nightly-2024-04-14", "doc"]
 cwd = "example"
 install_crate = false
diff --git a/router/src/components/form.rs b/router/src/components/form.rs
index f34e629f49..2601b93595 100644
--- a/router/src/components/form.rs
+++ b/router/src/components/form.rs
@@ -488,6 +488,17 @@ where
                 return;
             }
 
+            // <button formmethod="dialog"> should *not* dispatch the action, but should be allowed to
+            // just bubble up and close the <dialog> naturally
+            let is_dialog = ev
+                .submitter()
+                .and_then(|el| el.get_attribute("formmethod"))
+                .as_deref()
+                == Some("dialog");
+            if is_dialog {
+                return;
+            }
+
             ev.prevent_default();
 
             match ServFn::from_event(&ev) {