diff --git a/src/core_views.js b/src/core_views.js
index 2411b05..b5507e4 100644
--- a/src/core_views.js
+++ b/src/core_views.js
@@ -222,13 +222,13 @@ export function renderClassesView(deps) {
               <div class="modal-card">
                 <div class="panel-header">
                   <h3>${t("common.edit")}</h3>
-                  <button class="btn" id="classEditCancel">${t("common.cancel")}</button>
+                  <button class="btn" id="classEditCancel" type="button">${t("common.cancel")}</button>
                 </div>
                 <form id="classEditForm" class="panel-body form-grid cols-2">
                   <input name="name" required value="${escapeHtml(editingClass.name)}" placeholder="${t("classes.placeholder")}" />
                   <p class="form-error" id="classEditError" hidden></p>
                   <div class="actions-inline">
-                    <button class="btn btn-primary" type="submit">${t("common.save")}</button>
+                    <button class="btn btn-primary" id="classEditSave" type="button">${t("common.save")}</button>
                     <button class="btn" id="classEditCancelFooter" type="button">${t("common.cancel")}</button>
                   </div>
                 </form>
@@ -282,12 +282,15 @@ export function renderClassesView(deps) {
     renderView();
   });
 
-  document.getElementById("classEditForm")?.addEventListener("submit", (event) => {
-    event.preventDefault();
+  const commitClassEdit = () => {
     if (!editingClass) {
       return;
     }
-    const form = new FormData(event.currentTarget);
+    const formNode = document.getElementById("classEditForm");
+    if (!(formNode instanceof HTMLFormElement)) {
+      return;
+    }
+    const form = new FormData(formNode);
     const cleaned = String(form.get("name") || "").trim();
     if (!cleaned) {
       setFormError("classEditError", t("validation.required_name"));
@@ -298,7 +301,14 @@ export function renderClassesView(deps) {
     setSelectedClassEditId(null);
     saveState();
     renderView();
+  };
+
+  document.getElementById("classEditForm")?.addEventListener("submit", (event) => {
+    event.preventDefault();
+    commitClassEdit();
   });
+
+  document.getElementById("classEditSave")?.addEventListener("click", commitClassEdit);
 }
 
 export function renderDriversView(deps) {
@@ -372,7 +382,7 @@ export function renderDriversView(deps) {
               <div class="modal-card">
                 <div class="panel-header">
                   <h3>${t("common.edit")}</h3>
-                  <button class="btn" id="driverEditCancel">${t("common.cancel")}</button>
+                  <button class="btn" id="driverEditCancel" type="button">${t("common.cancel")}</button>
                 </div>
                 <form id="driverEditForm" class="panel-body form-grid cols-4">
                   <input name="name" required value="${escapeHtml(editingDriver.name)}" placeholder="${t("drivers.name_placeholder")}" />
@@ -385,7 +395,7 @@ export function renderDriversView(deps) {
                   <input name="transponder" value="${escapeHtml(editingDriver.transponder || "")}" placeholder="${t("drivers.transponder_placeholder")}" />
                   <p class="form-error" id="driverEditError" hidden></p>
                   <div class="actions-inline">
-                    <button class="btn btn-primary" type="submit">${t("common.save")}</button>
+                    <button class="btn btn-primary" id="driverEditSave" type="button">${t("common.save")}</button>
                     <button class="btn" id="driverEditCancelFooter" type="button">${t("common.cancel")}</button>
                   </div>
                 </form>
@@ -459,12 +469,15 @@ export function renderDriversView(deps) {
     renderView();
   });
 
-  document.getElementById("driverEditForm")?.addEventListener("submit", (event) => {
-    event.preventDefault();
+  const commitDriverEdit = () => {
     if (!editingDriver) {
       return;
     }
-    const form = new FormData(event.currentTarget);
+    const formNode = document.getElementById("driverEditForm");
+    if (!(formNode instanceof HTMLFormElement)) {
+      return;
+    }
+    const form = new FormData(formNode);
     const cleanedName = String(form.get("name") || "").trim();
     const cleanedClassId = String(form.get("classId") || "").trim();
     const cleanedBrand = String(form.get("brand") || "").trim();
@@ -492,7 +505,14 @@ export function renderDriversView(deps) {
     setSelectedDriverEditId(null);
     saveState();
     renderView();
+  };
+
+  document.getElementById("driverEditForm")?.addEventListener("submit", (event) => {
+    event.preventDefault();
+    commitDriverEdit();
   });
+
+  document.getElementById("driverEditSave")?.addEventListener("click", commitDriverEdit);
 }
 
 export function renderCarsView(deps) {
@@ -562,7 +582,7 @@ export function renderCarsView(deps) {
               <div class="modal-card">
                 <div class="panel-header">
                   <h3>${t("common.edit")}</h3>
-                  <button class="btn" id="carEditCancel">${t("common.cancel")}</button>
+                  <button class="btn" id="carEditCancel" type="button">${t("common.cancel")}</button>
                 </div>
                 <form id="carEditForm" class="panel-body form-grid cols-4">
                   <input name="name" required value="${escapeHtml(editingCar.name)}" placeholder="${t("cars.name_placeholder")}" />
@@ -570,7 +590,7 @@ export function renderCarsView(deps) {
                   <input name="transponder" required value="${escapeHtml(editingCar.transponder || "")}" placeholder="${t("cars.transponder_placeholder")}" />
                   <p class="form-error" id="carEditError" hidden></p>
                   <div class="actions-inline">
-                    <button class="btn btn-primary" type="submit">${t("common.save")}</button>
+                    <button class="btn btn-primary" id="carEditSave" type="button">${t("common.save")}</button>
                     <button class="btn" id="carEditCancelFooter" type="button">${t("common.cancel")}</button>
                   </div>
                 </form>
@@ -643,12 +663,15 @@ export function renderCarsView(deps) {
     renderView();
   });
 
-  document.getElementById("carEditForm")?.addEventListener("submit", (event) => {
-    event.preventDefault();
+  const commitCarEdit = () => {
     if (!editingCar) {
       return;
     }
-    const form = new FormData(event.currentTarget);
+    const formNode = document.getElementById("carEditForm");
+    if (!(formNode instanceof HTMLFormElement)) {
+      return;
+    }
+    const form = new FormData(formNode);
     const cleanedName = String(form.get("name") || "").trim();
     const cleanedBrand = String(form.get("brand") || "").trim();
     const cleanedTp = String(form.get("transponder") || "").trim();
@@ -674,5 +697,12 @@ export function renderCarsView(deps) {
     setSelectedCarEditId(null);
     saveState();
     renderView();
+  };
+
+  document.getElementById("carEditForm")?.addEventListener("submit", (event) => {
+    event.preventDefault();
+    commitCarEdit();
   });
+
+  document.getElementById("carEditSave")?.addEventListener("click", commitCarEdit);
 }