diff --git a/apps/matrix/apps/web/src/routes/(app)/chat/+page.svelte b/apps/matrix/apps/web/src/routes/(app)/chat/+page.svelte
index 0a92b65d2..8bf8e8deb 100644
--- a/apps/matrix/apps/web/src/routes/(app)/chat/+page.svelte
+++ b/apps/matrix/apps/web/src/routes/(app)/chat/+page.svelte
@@ -29,6 +29,20 @@
 				sidebarOpen = false;
 			}
 		});
+
+		// Keyboard shortcuts
+		window.addEventListener('keydown', (e) => {
+			// Cmd/Ctrl + K = Search
+			if ((e.metaKey || e.ctrlKey) && e.key === 'k') {
+				e.preventDefault();
+				showSearch = true;
+			}
+			// Cmd/Ctrl + N = New chat
+			if ((e.metaKey || e.ctrlKey) && e.key === 'n' && !e.shiftKey) {
+				e.preventDefault();
+				showCreateRoom = true;
+			}
+		});
 	}
 
 	function toggleSidebar() {