diff --git a/app/components/ChatInput.vue b/app/components/ChatInput.vue
index c277a10..12cce1d 100644
--- a/app/components/ChatInput.vue
+++ b/app/components/ChatInput.vue
@@ -110,7 +110,10 @@ const handleWindowKeyDown = async (event: KeyboardEvent) => {
     if (event.defaultPrevented) return;
     if (event.ctrlKey || event.metaKey || event.altKey) return;
 
-    if (document.activeElement === document.body) {
+    const isInteractive = document.activeElement?.closest('input, textarea, button, a, select, [contenteditable="true"]');
+    if (isInteractive) return;
+
+    if (!isInteractive) {
         const isPrintable = event.key.length === 1;
 
         if (isPrintable) {
diff --git a/app/components/ModelSelector.vue b/app/components/ModelSelector.vue
index 3a92160..a003c8d 100644
--- a/app/components/ModelSelector.vue
+++ b/app/components/ModelSelector.vue
@@ -6,7 +6,8 @@ import type { ModelWithProvider, ProviderWithModels } from '~/composables/useMod
 import { sortByReleaseDate } from '~/utils/sort';
 
 const { openDialog } = useDialog();
-const { allModels } = await useModels();
+const { allModels } = useModels();
+const { addShortcut } = useKeyboardShortcuts();
 
 const props = defineProps<{
     providers: ProviderWithModels[];
@@ -213,6 +214,14 @@ const handleSearchKeyDown = (event: KeyboardEvent) => {
             break;
     }
 };
+
+const unbindShortcut = addShortcut(['ctrl', 'shift', 'm'], () => {
+    toggleDropdown();
+});
+
+onUnmounted(() => {
+    unbindShortcut();
+})
 </script>
 
 <template>
diff --git a/app/composables/useKeyboardShortcuts.ts b/app/composables/useKeyboardShortcuts.ts
index 782914b..430cbe4 100644
--- a/app/composables/useKeyboardShortcuts.ts
+++ b/app/composables/useKeyboardShortcuts.ts
@@ -14,11 +14,6 @@ export const useKeyboardShortcuts = () => {
     };
 
     const handleKeyDown = (event: KeyboardEvent) => {
-        const isInput = ['INPUT', 'TEXTAREA'].includes((event.target as HTMLElement).tagName);
-        if (isInput && !event.ctrlKey && !event.metaKey && event.key !== 'Escape') {
-            return;
-        }
-
         const keys: string[] = [];
         if (event.ctrlKey) keys.push('ctrl');
         if (event.metaKey) keys.push('meta');
diff --git a/app/pages/agent/[id]/topic/[topicId].vue b/app/pages/agent/[id]/topic/[topicId].vue
index 3a72074..10ed83f 100644
--- a/app/pages/agent/[id]/topic/[topicId].vue
+++ b/app/pages/agent/[id]/topic/[topicId].vue
@@ -13,6 +13,7 @@ const { sendMessage, regenerateMessage } = useChat(route.params.id as string);
 const { getAgent } = useAgents();
 const { open: sidebarOpen, openSidebar } = useSidebar();
 const { providers, allModels } = useModels();
+const { addShortcut } = useKeyboardShortcuts();
 
 const agent = getAgent(route.params.id as string);
 
@@ -257,6 +258,52 @@ const activeGeneration = computed(() => {
 
 const { scrollToBottom } = useAutoScroll(chatPaneWrapper);
 
+addShortcut(['ctrl', 'alt', 'n'], () => {
+    return navigateTo(`/agent/${route.params.id}`);
+});
+
+addShortcut(['ctrl', 'shift', 'enter'], () => {
+    const lastMessage = topic.value?.messages?.at(-1);
+    if (lastMessage) {
+        handleRegenerate(lastMessage);
+    }
+});
+
+addShortcut(['ctrl', 'shift', 'backspace'], () => {
+    const lastMessage = topic.value?.messages?.at(-1);
+    if (lastMessage) {
+        handleDelete(lastMessage);
+    }
+});
+
+addShortcut(['ctrl', 'c'], () => {
+    if (activeGeneration.value === null) return;
+
+    handleCancel();
+})
+
+addShortcut(['alt', '['], async () => {
+    console.log("left");
+
+    const lastMessage = topic.value?.messages?.at(-1);
+    if (lastMessage && lastMessage.children.length > 0) {
+        await triplit.update('messages', lastMessage.id, {
+            focusedIndex: Math.max(0, lastMessage.focusedIndex! - 1)
+        });
+    }
+})
+
+addShortcut(['alt', ']'], async () => {
+    console.log("right");
+
+    const lastMessage = topic.value?.messages?.at(-1);
+    if (lastMessage && lastMessage.children.length > 0) {
+        await triplit.update('messages', lastMessage.id, {
+            focusedIndex: Math.min(lastMessage.children.length, lastMessage.focusedIndex! + 1)
+        });
+    }
+})
+
 onMounted(() => {
     scrollToBottom('instant');
 });
diff --git a/bun.lock b/bun.lock
index b50642a..d67f403 100644
--- a/bun.lock
+++ b/bun.lock
@@ -1,6 +1,5 @@
 {
   "lockfileVersion": 1,
-  "configVersion": 0,
   "workspaces": {
     "": {
       "name": "veridian",