diff --git a/assets/controllers/bo/modal_form_controller.js b/assets/controllers/bo/modal_form_controller.js
index f7d9a87..20d70e7 100644
--- a/assets/controllers/bo/modal_form_controller.js
+++ b/assets/controllers/bo/modal_form_controller.js
@@ -56,6 +56,12 @@ export default class extends Controller {
   _bindForm(url) {
     const form = this.modalBodyTarget.querySelector('form');
     if (!form) return;
+
+    if (this.hasModalFooterTarget) {
+      const saveBtn = this.modalFooterTarget.querySelector('[type="submit"]');
+      saveBtn?.addEventListener('click', () => form.requestSubmit(), {once: true});
+    }
+
     form.addEventListener('submit', async (e) => {
       e.preventDefault();
       const res = await fetch(url, {
@@ -69,6 +75,7 @@ export default class extends Controller {
       } else {
         this.modalBodyTarget.innerHTML = await res.text();
         this._moveFooter();
+        this._bindDirty();
         this._bindForm(url);
       }
     }, {once: true});
diff --git a/templates/backoffice/question_bank/_form_body.html.twig b/templates/backoffice/question_bank/_form_body.html.twig
index 0696966..5145430 100644
--- a/templates/backoffice/question_bank/_form_body.html.twig
+++ b/templates/backoffice/question_bank/_form_body.html.twig
@@ -32,6 +32,6 @@
 {% if isModal ?? false %}
 <template data-modal-footer>
     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ 'Cancel'|trans }}</button>
-    <button type="submit" form="{{ form.vars.id }}" class="btn btn-primary">{{ 'Save'|trans }}</button>
+    <button type="submit" class="btn btn-primary">{{ 'Save'|trans }}</button>
 </template>
 {% endif %}
diff --git a/templates/backoffice/quiz/_question_form_body.html.twig b/templates/backoffice/quiz/_question_form_body.html.twig
index 701d7f2..26427d1 100644
--- a/templates/backoffice/quiz/_question_form_body.html.twig
+++ b/templates/backoffice/quiz/_question_form_body.html.twig
@@ -30,6 +30,6 @@
 {% if isModal ?? false %}
 <template data-modal-footer>
     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ 'Cancel'|trans }}</button>
-    <button type="submit" form="{{ form.vars.id }}" class="btn btn-primary">{{ 'Save'|trans }}</button>
+    <button type="submit" class="btn btn-primary">{{ 'Save'|trans }}</button>
 </template>
 {% endif %}
diff --git a/translations/messages+intl-icu.nl.xliff b/translations/messages+intl-icu.nl.xliff
index c860042..85dc0f7 100644
--- a/translations/messages+intl-icu.nl.xliff
+++ b/translations/messages+intl-icu.nl.xliff
@@ -257,6 +257,10 @@
         <source>Error clearing quiz</source>
         <target>Fout bij het leegmaken van de test</target>
       </trans-unit>
+      <trans-unit id="NXU7HO." resname="Error saving order">
+        <source>Error saving order</source>
+        <target>Fout bij opslaan volgorde</target>
+      </trans-unit>
       <trans-unit id="bgWPQMg" resname="Export to XLSX">
         <source>Export to XLSX</source>
         <target>Exporteren naar XLSX</target>
@@ -409,13 +413,17 @@
         <source>Open</source>
         <target>Openen</target>
       </trans-unit>
+      <trans-unit id="vhCGOEN" resname="Order saved">
+        <source>Order saved</source>
+        <target>Volgorde opgeslagen</target>
+      </trans-unit>
       <trans-unit id="HmgPmMV" resname="Overview">
         <source>Overview</source>
         <target>Overzicht</target>
       </trans-unit>
       <trans-unit id="PywqOf4" resname="Owner(s)">
         <source>Owner(s)</source>
-        <target>Eigenaar(s)</target>
+        <target>Eigena(a)r(en)</target>
       </trans-unit>
       <trans-unit id="GqmFSHc" resname="Password">
         <source>Password</source>
@@ -473,6 +481,10 @@
         <source>Question bank</source>
         <target>Vragenbank</target>
       </trans-unit>
+      <trans-unit id="z7Pp9b9" resname="Question details">
+        <source>Question details</source>
+        <target>Vraagdetails</target>
+      </trans-unit>
       <trans-unit id="htaUa1k" resname="Question removed from quiz %quiz%">
         <source>Question removed from quiz %quiz%</source>
         <target>Vraag verwijderd uit quiz %quiz%</target>
@@ -717,6 +729,10 @@
         <source>Used in</source>
         <target>Gebruikt in</target>
       </trans-unit>
+      <trans-unit id=".EmYZIu" resname="View">
+        <source>View</source>
+        <target>Bekijken</target>
+      </trans-unit>
       <trans-unit id="JWRtx_o" resname="White">
         <source>White</source>
         <target>Wit</target>