diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index f8e16be53..6293d92dc 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -322,7 +322,7 @@ async function onKeyup(evt) {
             selectionStart = selectionEnd = selectionStart + 1;
             return;
         }
-        await submitForm();
+        await myForm.value.submit(evt);
     }
 }
 
@@ -342,7 +342,7 @@ defineExpose({
         <QForm
             ref="myForm"
             v-if="formData"
-            @submit.prevent
+            @submit.prevent="save"
             @keyup="onKeyup"
             @reset="reset"
             class="q-pa-md"
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 48a3e77b6..f1a59263b 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -41,7 +41,7 @@ const onDataSaved = async (formData, requestResponse) => {
     emit('onDataSaved', formData, requestResponse);
 };
 
-const onClick = async (saveAndContinue) => {
+const onClick = async (saveAndContinue = showSaveAndContinueBtn) => {
     isSaveAndContinue.value = saveAndContinue;
     if (formModelRef.value) {
         await formModelRef.value.submitForm();
@@ -64,7 +64,7 @@ defineExpose({
         @submit="onClick"
         v-bind="$attrs"
         @on-data-saved="onDataSaved"
-        @submit.prevent
+        :prevent-submit="false"
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
@@ -110,7 +110,6 @@ defineExpose({
                     :loading="isLoading"
                     data-cy="FormModelPopup_isSaveAndContinue"
                     z-max
-                    @click="onClick(true)"
                 />
             </div>
         </template>