diff --git a/src/components/home/contentAuth.vue b/src/components/home/contentAuth.vue
index d68cdb43f..f1fbe4a6b 100644
--- a/src/components/home/contentAuth.vue
+++ b/src/components/home/contentAuth.vue
@@ -31,8 +31,7 @@
 				<a
 					class="keyboard-shortcuts-button"
 					@click="showKeyboardShortcuts()"
-					@shortkey="showKeyboardShortcuts()"
-					v-shortkey="['?']"
+					v-shortcut="'?'"
 				>
 					<icon icon="keyboard"/>
 				</a>
diff --git a/src/components/home/topNavigation.vue b/src/components/home/topNavigation.vue
index 063152574..58e1fc048 100644
--- a/src/components/home/topNavigation.vue
+++ b/src/components/home/topNavigation.vue
@@ -12,8 +12,7 @@
 			<a
 				@click="$store.commit('toggleMenu')"
 				class="menu-show-button"
-				@shortkey="() => $store.commit('toggleMenu')"
-				v-shortkey="['ctrl', 'e']"
+				v-shortcut="'Control+e'"
 			>
 			</a>
 		</div>
@@ -39,8 +38,7 @@
 			<a
 				@click="openQuickActions"
 				class="trigger-button pr-0"
-				@shortkey="openQuickActions"
-				v-shortkey="['ctrl', 'k']"
+				v-shortcut="'Control+k'"
 			>
 				<icon icon="search"/>
 			</a>
diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index 0f05b2190..76fcac454 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -12,8 +12,7 @@
 				class="modal-container"
 				:class="{'has-overflow': overflow}"
 				@click.self.prevent.stop="$emit('close')"
-				@shortkey="$emit('close')"
-				v-shortkey="['esc']"
+				v-shortcut="'Escape'"
 			>
 				<div
 					class="modal-content"
diff --git a/src/views/list/ShowList.vue b/src/views/list/ShowList.vue
index cca9b3d52..8bb2b4a87 100644
--- a/src/views/list/ShowList.vue
+++ b/src/views/list/ShowList.vue
@@ -6,21 +6,25 @@
 		<div class="switch-view-container">
 			<div class="switch-view">
 				<router-link
+					v-shortcut="'g l'"
 					:class="{'is-active': $route.name.includes('list.list')}"
 					:to="{ name: 'list.list',   params: { listId: listId } }">
 					{{ $t('list.list.title') }}
 				</router-link>
 				<router-link
+					v-shortcut="'g g'"
 					:class="{'is-active': $route.name.includes('list.gantt')}"
 					:to="{ name: 'list.gantt',  params: { listId: listId } }">
 					{{ $t('list.gantt.title') }}
 				</router-link>
 				<router-link
+					v-shortcut="'g t'"
 					:class="{'is-active': $route.name.includes('list.table')}"
 					:to="{ name: 'list.table',  params: { listId: listId } }">
 					{{ $t('list.table.title') }}
 				</router-link>
 				<router-link
+					v-shortcut="'g k'"
 					:class="{'is-active': $route.name.includes('list.kanban')}"
 					:to="{ name: 'list.kanban', params: { listId: listId } }">
 					{{ $t('list.kanban.title') }}
diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index fc64d819f..30f79e78f 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -270,18 +270,16 @@
 						/>
 						<x-button
 							@click="setFieldActive('assignees')"
-							@shortkey="setFieldActive('assignees')"
 							type="secondary"
-							v-shortkey="['a']">
+							v-shortcut="'a'">
 							<span class="icon is-small"><icon icon="users"/></span>
 							{{ $t('task.detail.actions.assign') }}
 						</x-button>
 						<x-button
 							@click="setFieldActive('labels')"
-							@shortkey="setFieldActive('labels')"
 							type="secondary"
-							v-shortkey="['l']"
 							icon="tags"
+							v-shortcut="'l'"
 						>
 							{{ $t('task.detail.actions.label') }}
 						</x-button>
@@ -294,10 +292,9 @@
 						</x-button>
 						<x-button
 							@click="setFieldActive('dueDate')"
-							@shortkey="setFieldActive('dueDate')"
 							type="secondary"
-							v-shortkey="['d']"
 							icon="calendar"
+							v-shortcut="'d'"
 						>
 							{{ $t('task.detail.actions.dueDate') }}
 						</x-button>
@@ -338,19 +335,17 @@
 						</x-button>
 						<x-button
 							@click="setFieldActive('attachments')"
-							@shortkey="setFieldActive('attachments')"
 							type="secondary"
-							v-shortkey="['f']"
 							icon="paperclip"
+							v-shortcut="'f'"
 						>
 							{{ $t('task.detail.actions.attachments') }}
 						</x-button>
 						<x-button
 							@click="setFieldActive('relatedTasks')"
-							@shortkey="setFieldActive('relatedTasks')"
 							type="secondary"
-							v-shortkey="['r']"
 							icon="sitemap"
+							v-shortcut="'r'"
 						>
 							{{ $t('task.detail.actions.relatedTasks') }}
 						</x-button>