diff --git a/src/http/fetch_request.ts b/src/http/fetch_request.ts
index 0dcc206f2..404429408 100644
--- a/src/http/fetch_request.ts
+++ b/src/http/fetch_request.ts
@@ -55,13 +55,22 @@ export class FetchRequest {
   }
 
   get url() {
-    const url = this.location.absoluteURL
-    const query = this.params.toString()
-    if (this.isIdempotent && query.length) {
-      return [url, query].join(url.includes("?") ? "&" : "?")
-    } else {
-      return url
+    const url = new URL(this.location.absoluteURL)
+
+    if (this.isIdempotent) {
+      const currentUrl = new URL(window.location.href)
+
+      for (const [ key, value ] of this.params) {
+        if (currentUrl.searchParams.has(key)) {
+          currentUrl.searchParams.delete(key)
+          url.searchParams.set(key, value)
+        } else {
+          url.searchParams.append(key, value)
+        }
+      }
     }
+
+    return url.href
   }
 
   get params() {
diff --git a/src/tests/fixtures/form.html b/src/tests/fixtures/form.html
index c4c566f43..3b36fae7b 100644
--- a/src/tests/fixtures/form.html
+++ b/src/tests/fixtures/form.html
@@ -26,7 +26,24 @@
         <input type="hidden" name="status" value="204">
         <input type="submit" style="">
       </form>
+      <form action="/src/tests/fixtures/form.html" method="get">
+        <input type="hidden" name="query" value="true">
+        <input type="submit">
+      </form>
     </div>
+    <hr>
+    <div id="no-action">
+      <form class="single">
+        <input type="hidden" name="query" value="1">
+        <input type="submit">
+      </form>
+      <form class="multiple">
+        <input type="hidden" name="query" value="1">
+        <input type="hidden" name="query" value="2">
+        <input type="submit">
+      </form>
+    </div>
+    <hr>
     <div id="reject">
       <form class="unprocessable_entity" action="/__turbo/reject" method="post">
         <input type="hidden" name="status" value="422">
diff --git a/src/tests/functional/form_submission_tests.ts b/src/tests/functional/form_submission_tests.ts
index a83b291a1..349b7964b 100644
--- a/src/tests/functional/form_submission_tests.ts
+++ b/src/tests/functional/form_submission_tests.ts
@@ -5,7 +5,7 @@ export class FormSubmissionTests extends TurboDriveTestCase {
     await this.goToLocation("/src/tests/fixtures/form.html")
   }
 
-  async "test standard form submission with redirect response"() {
+  async "test standard POST form submission with redirect response"() {
     this.listenForFormSubmissions()
     const button = await this.querySelector("#standard form.redirect input[type=submit]")
     await button.click()
@@ -16,6 +16,17 @@ export class FormSubmissionTests extends TurboDriveTestCase {
     this.assert.equal(await this.visitAction, "advance")
   }
 
+  async "test standard GET form submission"() {
+    this.listenForFormSubmissions()
+    await this.clickSelector("#standard form[method=get] input[type=submit]")
+    await this.nextBody
+
+    this.assert.ok(this.turboFormSubmitted)
+    this.assert.equal(await this.pathname, "/src/tests/fixtures/form.html")
+    this.assert.equal(await this.search, "?query=true")
+    this.assert.equal(await this.visitAction, "advance")
+  }
+
   async "test standard form submission with empty created response"() {
     const htmlBefore = await this.outerHTMLForSelector("body")
     const button = await this.querySelector("#standard form.created input[type=submit]")
@@ -36,6 +47,42 @@ export class FormSubmissionTests extends TurboDriveTestCase {
     this.assert.equal(htmlAfter, htmlBefore)
   }
 
+  async "test no-action form submission with single parameter"() {
+    await this.clickSelector("#no-action form.single input[type=submit]")
+    await this.nextBody
+
+    this.assert.equal(await this.pathname, "/src/tests/fixtures/form.html")
+    this.assert.equal(await this.search, "?query=1")
+
+    await this.clickSelector("#no-action form.single input[type=submit]")
+    await this.nextBody
+
+    this.assert.equal(await this.pathname, "/src/tests/fixtures/form.html")
+    this.assert.equal(await this.search, "?query=1")
+
+    await this.goToLocation("/src/tests/fixtures/form.html?query=2")
+    await this.clickSelector("#no-action form.single input[type=submit]")
+    await this.nextBody
+
+    this.assert.equal(await this.pathname, "/src/tests/fixtures/form.html")
+    this.assert.equal(await this.search, "?query=1")
+  }
+
+  async "test no-action form submission with multiple parameters"() {
+    await this.goToLocation("/src/tests/fixtures/form.html?query=2")
+    await this.clickSelector("#no-action form.multiple input[type=submit]")
+    await this.nextBody
+
+    this.assert.equal(await this.pathname, "/src/tests/fixtures/form.html")
+    this.assert.equal(await this.search, "?query=1&query=2")
+
+    await this.clickSelector("#no-action form.multiple input[type=submit]")
+    await this.nextBody
+
+    this.assert.equal(await this.pathname, "/src/tests/fixtures/form.html")
+    this.assert.equal(await this.search, "?query=1&query=2")
+  }
+
   async "test invalid form submission with unprocessable entity status"() {
     await this.clickSelector("#reject form.unprocessable_entity input[type=submit]")
     await this.nextBody
@@ -168,10 +215,9 @@ export class FormSubmissionTests extends TurboDriveTestCase {
   }
 
   listenForFormSubmissions() {
-    this.remote.execute(() => addEventListener("turbo:submit-start", function eventListener(event) {
-      removeEventListener("turbo:submit-start", eventListener, false)
+    this.remote.execute(() => addEventListener("turbo:submit-start", (event) => {
       document.head.insertAdjacentHTML("beforeend", `<meta name="turbo-form-submitted">`)
-    }, false))
+    }, { once: true }))
   }
 
   get turboFormSubmitted(): Promise<boolean> {
diff --git a/src/tests/helpers/functional_test_case.ts b/src/tests/helpers/functional_test_case.ts
index 9d1a6edef..3ed8ab7c1 100644
--- a/src/tests/helpers/functional_test_case.ts
+++ b/src/tests/helpers/functional_test_case.ts
@@ -90,6 +90,10 @@ export class FunctionalTestCase extends InternTestCase {
     return this.evaluate(() => location.pathname)
   }
 
+  get search(): Promise<string> {
+    return this.evaluate(() => location.search)
+  }
+
   get hash(): Promise<string> {
     return this.evaluate(() => location.hash)
   }