diff --git a/assets/js/events.js b/assets/js/events.js
index 8c52492f5..164f45737 100644
--- a/assets/js/events.js
+++ b/assets/js/events.js
@@ -82,4 +82,16 @@ export function registerGlobalEventHandlers() {
       target.dispatchEvent(new Event("click", { bubbles: true }));
     }
   });
+
+  // Ignore submit events on elements with phx-nosubmit
+  window.addEventListener(
+    "submit",
+    (event) => {
+      if (event.target.hasAttribute("phx-nosubmit")) {
+        event.preventDefault();
+        event.stopPropagation();
+      }
+    },
+    { capture: true }
+  );
 }
diff --git a/lib/livebook_web/live/file_select_component.ex b/lib/livebook_web/live/file_select_component.ex
index c7d3cf6f2..a2fe6d153 100644
--- a/lib/livebook_web/live/file_select_component.ex
+++ b/lib/livebook_web/live/file_select_component.ex
@@ -86,7 +86,7 @@ defmodule LivebookWeb.FileSelectComponent do
             class="grow"
             phx-change="set_path"
             phx-submit={if @submit_event, do: "submit"}
-            onsubmit={unless @submit_event, do: "return false"}
+            phx-nosubmit={!@submit_event}
             phx-target={@myself}
           >
             <input
diff --git a/lib/livebook_web/live/session_live/bin_component.ex b/lib/livebook_web/live/session_live/bin_component.ex
index 77ffdd9aa..bad403034 100644
--- a/lib/livebook_web/live/session_live/bin_component.ex
+++ b/lib/livebook_web/live/session_live/bin_component.ex
@@ -37,7 +37,7 @@ defmodule LivebookWeb.SessionLive.BinComponent do
           <form
             :if={@bin_entries != []}
             phx-change="search"
-            onsubmit="return false"
+            phx-nosubmit
             phx-target={@myself}
             class="mt-1 relative"
           >
diff --git a/lib/livebook_web/live/session_live/export_live_markdown_component.ex b/lib/livebook_web/live/session_live/export_live_markdown_component.ex
index 753bf94fc..a07bb4181 100644
--- a/lib/livebook_web/live/session_live/export_live_markdown_component.ex
+++ b/lib/livebook_web/live/session_live/export_live_markdown_component.ex
@@ -27,7 +27,7 @@ defmodule LivebookWeb.SessionLive.ExportLiveMarkdownComponent do
     ~H"""
     <div class="flex flex-col space-y-6">
       <div class="flex">
-        <form phx-change="set_options" onsubmit="return false;" phx-target={@myself}>
+        <form phx-change="set_options" phx-nosubmit phx-target={@myself}>
           <.switch_field name="include_outputs" label="Include outputs" value={@include_outputs} />
         </form>
       </div>
diff --git a/lib/livebook_web/live/session_live/persistence_component.ex b/lib/livebook_web/live/session_live/persistence_component.ex
index fa3bd65c5..7f3e7d8b0 100644
--- a/lib/livebook_web/live/session_live/persistence_component.ex
+++ b/lib/livebook_web/live/session_live/persistence_component.ex
@@ -86,7 +86,7 @@ defmodule LivebookWeb.SessionLive.PersistenceComponent do
         <form
           phx-change="set_options"
           phx-target={@myself}
-          onsubmit="return false;"
+          phx-nosubmit
           class="flex flex-col space-y-4 items-start max-w-full"
         >
           <div class="flex flex-col space-y-4">
diff --git a/lib/livebook_web/live/session_live/shortcuts_component.ex b/lib/livebook_web/live/session_live/shortcuts_component.ex
index 9fca0bb2b..86eb3d737 100644
--- a/lib/livebook_web/live/session_live/shortcuts_component.ex
+++ b/lib/livebook_web/live/session_live/shortcuts_component.ex
@@ -161,7 +161,7 @@ defmodule LivebookWeb.SessionLive.ShortcutsComponent do
         you have editor focus and directly modify the given cell content.
       </p>
       <div class="flex">
-        <form class="my-2" phx-change="settings" onsubmit="return false;" phx-target={@myself}>
+        <form class="my-2" phx-change="settings" phx-nosubmit phx-target={@myself}>
           <.switch_field name="basic" label="Basic view (essential shortcuts only)" value={@basic} />
         </form>
       </div>
diff --git a/lib/livebook_web/live/settings_live.ex b/lib/livebook_web/live/settings_live.ex
index d07f5b473..619bb0f18 100644
--- a/lib/livebook_web/live/settings_live.ex
+++ b/lib/livebook_web/live/settings_live.ex
@@ -82,7 +82,7 @@ defmodule LivebookWeb.SettingsLive do
             <h2 class="text-xl text-gray-800 font-medium pb-2 border-b border-gray-200">
               Updates
             </h2>
-            <form class="mt-4" phx-change="save" onsubmit="return false;">
+            <form class="mt-4" phx-change="save" phx-nosubmit>
               <.switch_field
                 name="update_check_enabled"
                 label="Show banner when a new Livebook version is available"