diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index e3f87020c..9f5ae319c 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -211,7 +211,6 @@ watch(formUrl, async () => {
         <QForm
             v-if="formData"
             @submit="save"
-            @keyup.enter="save"
             @reset="reset"
             class="q-pa-md"
             id="formModel"
diff --git a/src/pages/Claim/ClaimRmaList.vue b/src/pages/Claim/ClaimRmaList.vue
index ca2878bd3..b906e32fa 100644
--- a/src/pages/Claim/ClaimRmaList.vue
+++ b/src/pages/Claim/ClaimRmaList.vue
@@ -67,7 +67,7 @@ async function remove({ id }) {
     <QPage class="column items-center q-pa-md sticky">
         <QPageSticky expand position="top" :offset="[16, 16]">
             <QCard class="card q-pa-md">
-                <QForm @submit="submit" @keyup.enter="submit">
+                <QForm @submit="submit">
                     <VnInput
                         ref="input"
                         v-model="newRma.code"
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
index 52b37c105..b150f4d8b 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
@@ -55,7 +55,7 @@ const onSubmit = async () => {
     <QDialog ref="dialogRef">
         <QCard class="q-pa-md q-mb-md">
             <QCardSection>
-                <QForm @submit="onSubmit()" @keyup.enter="onSubmit()" class="q-pa-sm">
+                <QForm @submit="onSubmit()" class="q-pa-sm">
                     <div>
                         {{
                             t('Add observation to all selected clients', {
diff --git a/src/pages/Login/LoginMain.vue b/src/pages/Login/LoginMain.vue
index bf5968781..e2ccdac16 100644
--- a/src/pages/Login/LoginMain.vue
+++ b/src/pages/Login/LoginMain.vue
@@ -67,11 +67,7 @@ async function onSubmit() {
 </script>
 
 <template>
-    <QForm
-        @submit="onSubmit"
-        @keyup.enter="onSubmit"
-        class="q-gutter-y-md q-pa-lg formCard"
-    >
+    <QForm @submit="onSubmit" class="q-gutter-y-md q-pa-lg formCard">
         <VnLogo alt="Logo" fit="contain" :ratio="16 / 9" class="q-mb-md" />
 
         <VnInput
diff --git a/src/pages/Login/TwoFactor.vue b/src/pages/Login/TwoFactor.vue
index 58da6d4dc..b3a139149 100644
--- a/src/pages/Login/TwoFactor.vue
+++ b/src/pages/Login/TwoFactor.vue
@@ -48,11 +48,7 @@ async function onSubmit() {
 }
 </script>
 <template>
-    <QForm
-        @submit="onSubmit"
-        @keyup.enter="onSubmit"
-        class="q-gutter-y-md q-pa-lg formCard"
-    >
+    <QForm @submit="onSubmit" class="q-gutter-y-md q-pa-lg formCard">
         <div class="column items-center">
             <QIcon name="phonelink_lock" size="xl" color="primary" />
             <h5 class="text-center q-my-md">{{ t('twoFactor.insert') }}</h5>
diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 4935d2e7b..4462846cb 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -211,7 +211,6 @@ const onThermographCreated = async (data) => {
             :observe-form-changes="viewAction === 'create'"
             :default-actions="true"
             @submit="onSubmit()"
-            @keyup.enter="onSubmit()"
             class="full-width"
             style="max-width: 800px"
         >
diff --git a/src/pages/Wagon/Type/WagonTypeCreate.vue b/src/pages/Wagon/Type/WagonTypeCreate.vue
index 35c18c9b8..bc9c1a40c 100644
--- a/src/pages/Wagon/Type/WagonTypeCreate.vue
+++ b/src/pages/Wagon/Type/WagonTypeCreate.vue
@@ -242,12 +242,7 @@ function exceedMaxHeight(pos) {
 
 <template>
     <QPage class="q-pa-sm q-mx-xl">
-        <QForm
-            @submit="onSubmit()"
-            @keyup.enter="onSubmit()"
-            @reset="onReset()"
-            class="q-pa-sm"
-        >
+        <QForm @submit="onSubmit()" @reset="onReset()" class="q-pa-sm">
             <QCard class="q-pa-md">
                 <VnInput
                     filled
diff --git a/src/pages/Wagon/WagonCreate.vue b/src/pages/Wagon/WagonCreate.vue
index c63ae3027..cf6bc3ff2 100644
--- a/src/pages/Wagon/WagonCreate.vue
+++ b/src/pages/Wagon/WagonCreate.vue
@@ -89,12 +89,7 @@ function filterType(val, update) {
 
 <template>
     <QPage class="q-pa-sm q-mx-xl">
-        <QForm
-            @submit="onSubmit()"
-            @keyup.enter="onSubmit()"
-            @reset="onReset()"
-            class="q-pa-sm"
-        >
+        <QForm @submit="onSubmit()" @reset="onReset()" class="q-pa-sm">
             <QCard class="q-pa-md">
                 <div class="row q-col-gutter-md">
                     <div class="col">