diff --git a/frontend/bun.lockb b/frontend/bun.lockb
index e7d0eedd5..56f0d3c5b 100755
Binary files a/frontend/bun.lockb and b/frontend/bun.lockb differ
diff --git a/frontend/package.json b/frontend/package.json
index 224d9c623..a3a25004d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -13,7 +13,7 @@
     "format:check": "prettier --check \"src/**/*.{ts,tsx,js,jsx,json,css,md}\""
   },
   "dependencies": {
-    "@opensecret/react": "0.3.3",
+    "@opensecret/react": "0.3.4",
     "@radix-ui/react-alert-dialog": "^1.1.1",
     "@radix-ui/react-avatar": "^1.1.0",
     "@radix-ui/react-dialog": "^1.1.1",
diff --git a/frontend/src/components/ChatHistoryList.tsx b/frontend/src/components/ChatHistoryList.tsx
index 60b2e2fe3..beeb0c704 100644
--- a/frontend/src/components/ChatHistoryList.tsx
+++ b/frontend/src/components/ChatHistoryList.tsx
@@ -52,7 +52,7 @@ export function ChatHistoryList({ currentChatId }: ChatHistoryListProps) {
     <>
       {chats.map((chat) => (
         <div key={chat.id} className="relative">
-          <Link to={`/chat/${chat.id}`}>
+          <Link to="/chat/$chatId" params={{ chatId: chat.id }}>
             <div
               className={`rounded-lg py-2 transition-all hover:text-primary cursor-pointer ${
                 chat.id === currentChatId ? "text-primary" : "text-muted-foreground"
diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx
index 8f71b3765..07c996aee 100644
--- a/frontend/src/components/Sidebar.tsx
+++ b/frontend/src/components/Sidebar.tsx
@@ -27,9 +27,13 @@ export function Sidebar({
     if (location.pathname === "/") {
       document.getElementById("message")?.focus();
     } else {
-      router.navigate({ to: `/` }).then(() => {
-        document.getElementById("message")?.focus();
-      });
+      try {
+        await router.navigate({ to: `/` });
+        // Ensure element is available after navigation
+        setTimeout(() => document.getElementById("message")?.focus(), 0);
+      } catch (error) {
+        console.error("Navigation failed:", error);
+      }
     }
   }