diff --git a/src/boot/keyShortcut.js b/src/boot/keyShortcut.js
index 5afb5b74a..028ca7fea 100644
--- a/src/boot/keyShortcut.js
+++ b/src/boot/keyShortcut.js
@@ -1,5 +1,5 @@
 export default {
-    mounted: function (el, binding) {
+    mounted(el, binding) {
         const shortcut = binding.value ?? '+';
 
         const { key, ctrl, alt, callback } =
@@ -8,25 +8,24 @@ export default {
                       key: shortcut,
                       ctrl: true,
                       alt: true,
-                      callback: () =>
-                          document
-                              .querySelector(`button[shortcut="${shortcut}"]`)
-                              ?.click(),
+                      callback: () => el.click(),
                   }
                 : binding.value;
 
+        if (!el.hasAttribute('shortcut')) {
+            el.setAttribute('shortcut', key);
+        }
+
         const handleKeydown = (event) => {
             if (event.key === key && (!ctrl || event.ctrlKey) && (!alt || event.altKey)) {
                 callback();
             }
         };
 
-        // Attach the event listener to the window
         window.addEventListener('keydown', handleKeydown);
-
         el._handleKeydown = handleKeydown;
     },
-    unmounted: function (el) {
+    unmounted(el) {
         if (el._handleKeydown) {
             window.removeEventListener('keydown', el._handleKeydown);
         }