diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 184913c49..57456ba3d 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -144,8 +144,8 @@ const defaultButtons = computed(() => ({
 }));
 
 const submitForm = async () => {
-    const valid = await myForm.value.validate();
-    if (valid) {
+    const isFormValid = await myForm.value.validate();
+    if (isFormValid) {
         try {
             await save();
         } catch (error) {
@@ -333,7 +333,6 @@ async function onKeyup(evt) {
 }
 
 defineExpose({
-    myForm,
     save,
     isLoading,
     hasChanges,
@@ -347,7 +346,7 @@ defineExpose({
         <QForm
             ref="myForm"
             v-if="formData"
-            @submit.prevent="save"
+            @submit.prevent
             @keyup.prevent="onKeyup"
             @reset="reset"
             class="q-pa-md"
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index c6d901b23..b3370e2d1 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -43,7 +43,6 @@ const onDataSaved = async (formData, requestResponse) => {
 
 const onClick = async (saveAndContinue) => {
     isSaveAndContinue.value = saveAndContinue;
-    formModelRef.value.myForm.submit();
 };
 
 defineExpose({
@@ -88,6 +87,7 @@ defineExpose({
                     :flat="showSaveAndContinueBtn"
                     :label="t('globals.save')"
                     :title="t('globals.save')"
+                    @click="onClick(false)"
                     type="submit"
                     color="primary"
                     class="q-ml-sm"
@@ -101,6 +101,7 @@ defineExpose({
                     :label="t('globals.isSaveAndContinue')"
                     :title="t('globals.isSaveAndContinue')"
                     color="primary"
+                    type="submit"
                     class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"