diff --git a/frontend/src/components/input/editor/TipTap.vue b/frontend/src/components/input/editor/TipTap.vue
index 72cf41c04..e2a718ffc 100644
--- a/frontend/src/components/input/editor/TipTap.vue
+++ b/frontend/src/components/input/editor/TipTap.vue
@@ -144,7 +144,7 @@
 <script setup lang="ts">
 import {computed, nextTick, onBeforeUnmount, onMounted, ref, watch, watchEffect} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {eventToHotkeyString} from '@github/hotkey'
+import {eventToShortcutString} from '@/helpers/shortcut'
 
 import EditorToolbar from './EditorToolbar.vue'
 
@@ -780,9 +780,9 @@ function setFocusToEditor(event: KeyboardEvent) {
 		return
 	}
 
-	const hotkeyString = eventToHotkeyString(event)
-	if (!hotkeyString) return
-	if (hotkeyString !== props.editShortcut ||
+	const shortcutString = eventToShortcutString(event)
+	if (!shortcutString) return
+	if (shortcutString !== props.editShortcut ||
 		event.target.tagName.toLowerCase() === 'input' ||
 		event.target.tagName.toLowerCase() === 'textarea' ||
 		event.target.contentEditable === 'true') {
diff --git a/frontend/src/components/misc/OpenQuickActions.vue b/frontend/src/components/misc/OpenQuickActions.vue
index a7b8841d1..a264b32be 100644
--- a/frontend/src/components/misc/OpenQuickActions.vue
+++ b/frontend/src/components/misc/OpenQuickActions.vue
@@ -2,19 +2,19 @@
 import BaseButton from '@/components/base/BaseButton.vue'
 import {useBaseStore} from '@/stores/base'
 import {onBeforeUnmount, onMounted} from 'vue'
-import {eventToHotkeyString} from '@github/hotkey'
+import {eventToShortcutString} from '@/helpers/shortcut'
 import {isAppleDevice} from '@/helpers/isAppleDevice'
 
 const baseStore = useBaseStore()
 
 // See https://github.com/github/hotkey/discussions/85#discussioncomment-5214660
 function openQuickActionsViaHotkey(event) {
-	const hotkeyString = eventToHotkeyString(event)
-	if (!hotkeyString) return
-	
+	const shortcutString = eventToShortcutString(event)
+	if (!shortcutString) return
+
 	// On macOS, use Cmd+K (Meta+K), on other platforms use Ctrl+K (Control+K)
-	const expectedHotkey = isAppleDevice() ? 'Meta+k' : 'Control+k'
-	if (hotkeyString !== expectedHotkey) return
+	const expectedShortcut = isAppleDevice() ? 'Meta+KeyK' : 'Control+KeyK'
+	if (shortcutString !== expectedShortcut) return
 	
 	event.preventDefault()
 
diff --git a/frontend/src/composables/useTaskDetailShortcuts.ts b/frontend/src/composables/useTaskDetailShortcuts.ts
index fd63922d4..d383d58c1 100644
--- a/frontend/src/composables/useTaskDetailShortcuts.ts
+++ b/frontend/src/composables/useTaskDetailShortcuts.ts
@@ -1,5 +1,5 @@
 import {ref, onMounted, onBeforeUnmount} from 'vue'
-import {eventToHotkeyString} from '@github/hotkey'
+import {eventToShortcutString} from '@/helpers/shortcut'
 
 import {getTaskIdentifier} from '@/models/task'
 import type {ITask} from '@/modelTypes/ITask'
@@ -39,10 +39,10 @@ export function useTaskDetailShortcuts({
 
 	// See https://github.com/github/hotkey/discussions/85#discussioncomment-5214660
 	async function handleTaskHotkey(event: KeyboardEvent) {
-		const hotkeyString = eventToHotkeyString(event)
-		if (!hotkeyString) return
+		const shortcutString = eventToShortcutString(event)
+		if (!shortcutString) return
 
-		if (hotkeyString === 'Control+s' || hotkeyString === 'Meta+s') {
+		if (shortcutString === 'Control+KeyS' || shortcutString === 'Meta+KeyS') {
 			event.preventDefault()
 			onSave()
 			return
@@ -58,12 +58,12 @@ export function useTaskDetailShortcuts({
 			return
 		}
 
-		if (hotkeyString === 'Control+.') {
+		if (shortcutString === 'Control+Period') {
 			await copySavely(window.location.href)
 			return
 		}
 
-		if (hotkeyString === '.') {
+		if (shortcutString === 'Period') {
 			dotKeyPressedTimes.value++
 			if (dotKeyPressedTimeout !== null) {
 				clearTimeout(dotKeyPressedTimeout)
diff --git a/frontend/src/helpers/inputPrompt.ts b/frontend/src/helpers/inputPrompt.ts
index 1b5697f27..11dd3325f 100644
--- a/frontend/src/helpers/inputPrompt.ts
+++ b/frontend/src/helpers/inputPrompt.ts
@@ -1,7 +1,7 @@
 import {createRandomID} from '@/helpers/randomId'
 import {computePosition, flip, shift, offset} from '@floating-ui/dom'
 import {nextTick} from 'vue'
-import {eventToHotkeyString} from '@github/hotkey'
+import {eventToShortcutString} from '@/helpers/shortcut'
 
 export default function inputPrompt(pos: ClientRect, oldValue: string = ''): Promise<string> {
 	return new Promise((resolve) => {
@@ -90,8 +90,8 @@ export default function inputPrompt(pos: ClientRect, oldValue: string = ''): Pro
 		}
 
 		document.getElementById(id)?.addEventListener('keydown', event => {
-			const hotkeyString = eventToHotkeyString(event)
-			if (hotkeyString !== 'Enter') {
+			const shortcutString = eventToShortcutString(event)
+			if (shortcutString !== 'Enter') {
 				return
 			}