diff --git a/src/boot/keyShortcut.js b/src/boot/keyShortcut.js
index 2d84dcc6d..5afb5b74a 100644
--- a/src/boot/keyShortcut.js
+++ b/src/boot/keyShortcut.js
@@ -9,7 +9,9 @@ export default {
                       ctrl: true,
                       alt: true,
                       callback: () =>
-                          document.querySelector('button[shortcut="+"]')?.click(),
+                          document
+                              .querySelector(`button[shortcut="${shortcut}"]`)
+                              ?.click(),
                   }
                 : binding.value;
 
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 2582ea892..71ca07a53 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -291,7 +291,6 @@ defineExpose({
 </script>
 <template>
     <QDrawer
-        v-shortcut
         v-if="$props.rightSearch"
         v-model="stateStore.rightDrawer"
         side="right"
diff --git a/src/components/common/VnSectionMain.vue b/src/components/common/VnSectionMain.vue
index 2372fb2b0..0c1641ce1 100644
--- a/src/components/common/VnSectionMain.vue
+++ b/src/components/common/VnSectionMain.vue
@@ -14,7 +14,7 @@ onMounted(() => (stateStore.leftDrawer = $props.leftDrawer));
 </script>
 
 <template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256" v-shortcut>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit text-grey-8">
             <LeftMenu />
         </QScrollArea>
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index 88c5ee293..51cd20071 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -5,7 +5,7 @@ const quasar = useQuasar();
 </script>
 
 <template>
-    <QLayout view="hHh LpR fFf">
+    <QLayout view="hHh LpR fFf" v-shortcut>
         <Navbar />
         <RouterView></RouterView>
         <QFooter v-if="quasar.platform.is.mobile"></QFooter>
diff --git a/src/pages/Account/Card/AccountMailAlias.vue b/src/pages/Account/Card/AccountMailAlias.vue
index 94e713538..15d03c665 100644
--- a/src/pages/Account/Card/AccountMailAlias.vue
+++ b/src/pages/Account/Card/AccountMailAlias.vue
@@ -110,7 +110,7 @@ onMounted(async () => await getAccountData(false));
 </script>
 
 <template>
-    <QPage class="column items-center q-pa-md" v-shortcut>
+    <QPage class="column items-center q-pa-md">
         <div class="full-width" style="max-width: 400px">
             <QSpinner v-if="loading" color="primary" size="md" />
             <VnPaginate
diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index c93693e57..a9e7affef 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -135,7 +135,7 @@ const toCustomerAddressEdit = (addressId) => {
     />
 
     <div class="full-width flex justify-center">
-        <QCard class="card-width q-pa-lg" v-if="addresses.length" v-shortcut>
+        <QCard class="card-width q-pa-lg" v-if="addresses.length">
             <QCardSection>
                 <div
                     v-for="(item, index) in addresses"
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 346e76681..548a67b0b 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -292,7 +292,13 @@ const showBalancePdf = ({ id }) => {
         </template>
     </VnTable>
     <QPageSticky :offset="[18, 18]" style="z-index: 2">
-        <QBtn @click.stop="showNewPaymentDialog()" color="primary" fab icon="add" />
+        <QBtn
+            @click.stop="showNewPaymentDialog()"
+            color="primary"
+            fab
+            icon="add"
+            shortcut="+"
+        />
         <QTooltip>
             {{ t('New payment') }}
         </QTooltip>
diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 607015ce5..12719b2cf 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -71,7 +71,7 @@ const updateData = () => {
 
 <template>
     <div class="full-width flex justify-center">
-        <QCard class="card-width q-pa-lg" v-shortcut>
+        <QCard class="card-width q-pa-lg">
             <VnPaginate
                 :filter="filter"
                 @on-fetch="fetch"
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 8f1957257..e3fcceb3a 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -445,7 +445,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             <ItemListFilter data-key="ItemList" />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md" v-shortcut>
+    <QPage class="column items-center q-pa-md">
         <VnPaginate
             ref="paginateRef"
             data-key="ItemList"
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index b9a40a754..d874a5dcb 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -65,7 +65,7 @@ const exprBuilder = (param, value) => {
             <ItemTypeFilter data-key="ItemTypeList" />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md" v-shortcut>
+    <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate
                 data-key="ItemTypeList"
diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index e19c8a244..d29f6ff15 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -46,7 +46,7 @@ function exprBuilder(param, value) {
             <ShelvingFilter data-key="ShelvingList" />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md" v-shortcut>
+    <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate
                 data-key="ShelvingList"
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index 818cc2efa..4bb6d5622 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -46,7 +46,7 @@ const redirectToUpdateView = (addressData) => {
 </script>
 
 <template>
-    <QPage class="column items-center q-pa-md" v-shortcut>
+    <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate
                 data-key="SupplierAddress"
diff --git a/src/pages/Supplier/Card/SupplierAgencyTerm.vue b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
index f6de30b06..99b672cc4 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTerm.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
@@ -48,7 +48,7 @@ const redirectToCreateView = () => {
         auto-load
     >
         <template #body="{ rows }">
-            <QCard class="q-pa-md" v-shortcut>
+            <QCard class="q-pa-md">
                 <VnRow
                     v-for="(row, index) in rows"
                     :key="index"
diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index 2acca6aa9..8d84e2b46 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -174,7 +174,6 @@ const openCreateModal = () => createTicketRequestDialogRef.value.show();
                     class="full-width q-mt-md"
                     :no-data-label="t('globals.noResults')"
                     @row-click="(_, row) => redirectToTicketSummary(row.ticketFk)"
-                    v-shortcut
                 >
                     <template #body-cell-description="{ row }">
                         <QTd @click.stop>
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index ab6e97842..f7cbb14e9 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -94,7 +94,6 @@ const openCreateModal = () => createTrackingDialogRef.value.show();
                     :pagination="{ rowsPerPage: 0 }"
                     class="full-width q-mt-md"
                     :no-data-label="t('globals.noResults')"
-                    v-shortcut
                 >
                     <template #body-cell-worker="{ row }">
                         <QTd @click.stop>
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index 60084ff04..6d83581ee 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -147,7 +147,6 @@ const removeThermograph = async (id) => {
                 :no-data-label="t('No results')"
                 row-key="id"
                 class="full-width q-mt-md"
-                v-shortcut
             >
                 <template #body-cell-downloadFile="{ row }">
                     <QTd auto-width>
diff --git a/src/pages/Wagon/Type/WagonTypeList.vue b/src/pages/Wagon/Type/WagonTypeList.vue
index 070b120ba..b7bbf8c5d 100644
--- a/src/pages/Wagon/Type/WagonTypeList.vue
+++ b/src/pages/Wagon/Type/WagonTypeList.vue
@@ -40,7 +40,7 @@ async function remove(row) {
 </script>
 
 <template>
-    <QPage class="column items-center q-pa-md" v-shortcut>
+    <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate
                 data-key="WagonTypeList"
diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index ed68bddfd..c4824b861 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -47,7 +47,7 @@ async function remove(row) {
 </script>
 
 <template>
-    <QPage class="column items-center q-pa-md" v-shortcut>
+    <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate
                 data-key="WagonList"
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index c2ce292bb..a53aac270 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -51,7 +51,7 @@ function reloadData() {
 </script>
 
 <template>
-    <QPage class="column items-center q-pa-md centerCard" v-shortcut>
+    <QPage class="column items-center q-pa-md centerCard">
         <FetchData
             url="workers/getAvailablePda"
             @on-fetch="(data) => (deviceProductions = data)"
diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index 07400dec1..32a7db4c4 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -72,7 +72,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             />
         </QScrollArea>
     </QDrawer>
-    <QPage class="q-pa-md flex justify-center" v-shortcut>
+    <QPage class="q-pa-md flex justify-center">
         <ZoneCalendarGrid
             v-model:events="events"
             v-model:firstDay="firstDay"
diff --git a/src/pages/Zone/Card/ZoneWarehouses.vue b/src/pages/Zone/Card/ZoneWarehouses.vue
index d0ba00389..6b2933224 100644
--- a/src/pages/Zone/Card/ZoneWarehouses.vue
+++ b/src/pages/Zone/Card/ZoneWarehouses.vue
@@ -66,7 +66,7 @@ const openCreateWarehouseForm = () => createWarehouseDialogRef.value.show();
 </script>
 
 <template>
-    <QPage class="column items-center q-pa-md" v-shortcut>
+    <QPage class="column items-center q-pa-md">
         <div class="full-width" style="max-width: 400px">
             <VnPaginate
                 ref="paginateRef"