diff --git a/src/components/EditTableCellValueForm.vue b/src/components/EditTableCellValueForm.vue
index 6d3b7b08b..d0561107e 100644
--- a/src/components/EditTableCellValueForm.vue
+++ b/src/components/EditTableCellValueForm.vue
@@ -66,7 +66,7 @@ const closeForm = () => {
 </script>
 
 <template>
-    <QForm @submit="submitData()" class="all-pointer-events">
+    <QForm @submit="submitData()" @keyup.enter="submitData()" class="all-pointer-events">
         <QCard class="q-pa-lg">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
diff --git a/src/components/FilterItemForm.vue b/src/components/FilterItemForm.vue
index 4c329a8e8..b4c928ca8 100644
--- a/src/components/FilterItemForm.vue
+++ b/src/components/FilterItemForm.vue
@@ -140,7 +140,11 @@ const selectItem = ({ id }) => {
         @on-fetch="(data) => (InksOptions = data)"
         auto-load
     />
-    <QForm @submit="fetchResults()" class="all-pointer-events">
+    <QForm
+        @submit="fetchResults()"
+        @keyup.enter="fetchResults()"
+        class="all-pointer-events"
+    >
         <QCard class="column" style="padding: 32px; z-index: 100">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue
index 499d5bc4e..c005acde1 100644
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@@ -138,7 +138,11 @@ const selectTravel = ({ id }) => {
         @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
     />
-    <QForm @submit="fetchResults()" class="all-pointer-events">
+    <QForm
+        @submit="fetchResults()"
+        @keyup.enter="fetchResults()"
+        class="all-pointer-events"
+    >
         <QCard class="column" style="padding: 32px; z-index: 100">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index f3d49a8aa..396fcfbff 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -190,10 +190,10 @@ watch(formUrl, async () => {
         <QForm
             v-if="formData"
             @submit="save"
+            @keyup.enter="save"
             @reset="reset"
             class="q-pa-md"
             id="formModel"
-            @keyup.enter="save"
         >
             <QCard>
                 <slot
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 722462d4a..7fb621fc0 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -164,7 +164,7 @@ function formatValue(value) {
 </script>
 
 <template>
-    <QForm @submit="search">
+    <QForm @submit="search" @keyup.enter="search">
         <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>
diff --git a/src/pages/Claim/ClaimRmaList.vue b/src/pages/Claim/ClaimRmaList.vue
index b906e32fa..ca2878bd3 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">
+                <QForm @submit="submit" @keyup.enter="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 b150f4d8b..52b37c105 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()" class="q-pa-sm">
+                <QForm @submit="onSubmit()" @keyup.enter="onSubmit()" class="q-pa-sm">
                     <div>
                         {{
                             t('Add observation to all selected clients', {
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index c61b9f7ff..f61b246bc 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -75,6 +75,7 @@ onMounted(async () => {
     <QForm
         v-if="!initialDataLoading && optionsInitialData"
         @submit="makeInvoice(formData, clientsToInvoice)"
+        @keyup.enter="makeInvoice(formData, clientsToInvoice)"
         class="form-container q-pa-md"
         style="max-width: 256px"
     >
diff --git a/src/pages/Login/TwoFactor.vue b/src/pages/Login/TwoFactor.vue
index b3a139149..58da6d4dc 100644
--- a/src/pages/Login/TwoFactor.vue
+++ b/src/pages/Login/TwoFactor.vue
@@ -48,7 +48,11 @@ async function onSubmit() {
 }
 </script>
 <template>
-    <QForm @submit="onSubmit" class="q-gutter-y-md q-pa-lg formCard">
+    <QForm
+        @submit="onSubmit"
+        @keyup.enter="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/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index d5464ed1a..950615f6a 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -33,7 +33,7 @@ const addToOrder = async () => {
 
 <template>
     <div class="container order-catalog-item q-pb-md">
-        <QForm @submit.prevent="addToOrder">
+        <QForm @submit.prevent="addToOrder" @keyup.enter="addToOrder">
             <QMarkupTable class="shadow-0">
                 <tbody>
                     <tr v-for="item in fields" :key="item.warehouse">
diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 6758cb6ff..077b20d76 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -211,6 +211,7 @@ 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 bc9c1a40c..35c18c9b8 100644
--- a/src/pages/Wagon/Type/WagonTypeCreate.vue
+++ b/src/pages/Wagon/Type/WagonTypeCreate.vue
@@ -242,7 +242,12 @@ function exceedMaxHeight(pos) {
 
 <template>
     <QPage class="q-pa-sm q-mx-xl">
-        <QForm @submit="onSubmit()" @reset="onReset()" class="q-pa-sm">
+        <QForm
+            @submit="onSubmit()"
+            @keyup.enter="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 cf6bc3ff2..c63ae3027 100644
--- a/src/pages/Wagon/WagonCreate.vue
+++ b/src/pages/Wagon/WagonCreate.vue
@@ -89,7 +89,12 @@ function filterType(val, update) {
 
 <template>
     <QPage class="q-pa-sm q-mx-xl">
-        <QForm @submit="onSubmit()" @reset="onReset()" class="q-pa-sm">
+        <QForm
+            @submit="onSubmit()"
+            @keyup.enter="onSubmit()"
+            @reset="onReset()"
+            class="q-pa-sm"
+        >
             <QCard class="q-pa-md">
                 <div class="row q-col-gutter-md">
                     <div class="col">