diff --git a/client/src/common/types.ts b/client/src/common/types.ts
index ec9876c9e4..1c2ff06c9e 100644
--- a/client/src/common/types.ts
+++ b/client/src/common/types.ts
@@ -571,8 +571,6 @@ export interface ModelItemProps {
 export type ContextType = {
   navVisible: boolean;
   setNavVisible: React.Dispatch<React.SetStateAction<boolean>>;
-  openSidebarRef?: React.RefObject<HTMLButtonElement>;
-  closeSidebarRef?: React.RefObject<HTMLButtonElement>;
 };
 
 export interface SwitcherProps {
diff --git a/client/src/components/Chat/Header.tsx b/client/src/components/Chat/Header.tsx
index 966e4ad205..425cadeba3 100644
--- a/client/src/components/Chat/Header.tsx
+++ b/client/src/components/Chat/Header.tsx
@@ -18,8 +18,7 @@ const defaultInterface = getConfigDefaults().interface;
 
 export default function Header() {
   const { data: startupConfig } = useGetStartupConfig();
-  const { navVisible, setNavVisible, openSidebarRef, closeSidebarRef } =
-    useOutletContext<ContextType>();
+  const { navVisible, setNavVisible } = useOutletContext<ContextType>();
 
   const interfaceConfig = useMemo(
     () => startupConfig?.interface ?? defaultInterface,
@@ -52,12 +51,7 @@ export default function Header() {
                 transition={{ duration: 0.2 }}
                 key="header-buttons"
               >
-                <OpenSidebar
-                  ref={openSidebarRef}
-                  setNavVisible={setNavVisible}
-                  closeSidebarRef={closeSidebarRef}
-                  className="max-md:hidden"
-                />
+                <OpenSidebar setNavVisible={setNavVisible} className="max-md:hidden" />
                 <HeaderNewChat />
               </motion.div>
             )}
diff --git a/client/src/components/Chat/Menus/OpenSidebar.tsx b/client/src/components/Chat/Menus/OpenSidebar.tsx
index 5be467bb0c..e5a76ff4b4 100644
--- a/client/src/components/Chat/Menus/OpenSidebar.tsx
+++ b/client/src/components/Chat/Menus/OpenSidebar.tsx
@@ -1,16 +1,19 @@
-import { forwardRef } from 'react';
 import { TooltipAnchor, Button, Sidebar } from '@librechat/client';
 import { useLocalize } from '~/hooks';
 import { cn } from '~/utils';
 
-const OpenSidebar = forwardRef<
-  HTMLButtonElement,
-  {
-    setNavVisible: React.Dispatch<React.SetStateAction<boolean>>;
-    className?: string;
-    closeSidebarRef?: React.RefObject<HTMLButtonElement>;
-  }
->(({ setNavVisible, className, closeSidebarRef }, ref) => {
+/** Element ID for the close sidebar button - used for focus management */
+export const CLOSE_SIDEBAR_ID = 'close-sidebar-button';
+/** Element ID for the open sidebar button - used for focus management */
+export const OPEN_SIDEBAR_ID = 'open-sidebar-button';
+
+export default function OpenSidebar({
+  setNavVisible,
+  className,
+}: {
+  setNavVisible: React.Dispatch<React.SetStateAction<boolean>>;
+  className?: string;
+}) {
   const localize = useLocalize();
 
   const handleClick = () => {
@@ -18,9 +21,10 @@ const OpenSidebar = forwardRef<
       localStorage.setItem('navVisible', JSON.stringify(!prev));
       return !prev;
     });
-    requestAnimationFrame(() => {
-      closeSidebarRef?.current?.focus();
-    });
+    // Delay focus until after the sidebar animation completes (200ms)
+    setTimeout(() => {
+      document.getElementById(CLOSE_SIDEBAR_ID)?.focus();
+    }, 250);
   };
 
   return (
@@ -28,7 +32,7 @@ const OpenSidebar = forwardRef<
       description={localize('com_nav_open_sidebar')}
       render={
         <Button
-          ref={ref}
+          id={OPEN_SIDEBAR_ID}
           size="icon"
           variant="outline"
           data-testid="open-sidebar-button"
@@ -46,8 +50,4 @@ const OpenSidebar = forwardRef<
       }
     />
   );
-});
-
-OpenSidebar.displayName = 'OpenSidebar';
-
-export default OpenSidebar;
+}
diff --git a/client/src/components/Nav/Nav.tsx b/client/src/components/Nav/Nav.tsx
index 6b4750bf74..68dfbe2481 100644
--- a/client/src/components/Nav/Nav.tsx
+++ b/client/src/components/Nav/Nav.tsx
@@ -50,13 +50,9 @@ const Nav = memo(
   ({
     navVisible,
     setNavVisible,
-    openSidebarRef,
-    closeSidebarRef,
   }: {
     navVisible: boolean;
     setNavVisible: React.Dispatch<React.SetStateAction<boolean>>;
-    openSidebarRef?: React.RefObject<HTMLButtonElement>;
-    closeSidebarRef?: React.RefObject<HTMLButtonElement>;
   }) => {
     const localize = useLocalize();
     const { isAuthenticated } = useAuthContext();
@@ -170,7 +166,7 @@ const Nav = memo(
             <>
               <div className="mt-1.5" />
               <Suspense fallback={null}>
-                <BookmarkNav tags={tags} setTags={setTags} isSmallScreen={isSmallScreen} />
+                <BookmarkNav tags={tags} setTags={setTags} />
               </Suspense>
             </>
           )}
@@ -211,36 +207,32 @@ const Nav = memo(
             >
               <div className="h-full w-[320px] md:w-[260px]">
                 <div className="flex h-full flex-col">
-                  {navVisible && (
-                    <nav
-                      id="chat-history-nav"
-                      aria-label={localize('com_ui_chat_history')}
-                      className="flex h-full flex-col px-2 pb-3.5 md:px-3"
-                    >
-                      <div className="flex flex-1 flex-col" ref={outerContainerRef}>
-                        <MemoNewChat
-                          subHeaders={subHeaders}
-                          toggleNav={toggleNavVisible}
-                          headerButtons={headerButtons}
-                          isSmallScreen={isSmallScreen}
-                          openSidebarRef={openSidebarRef}
-                          closeSidebarRef={closeSidebarRef}
-                        />
-                        <Conversations
-                          conversations={conversations}
-                          moveToTop={moveToTop}
-                          toggleNav={itemToggleNav}
-                          containerRef={listRef}
-                          loadMoreConversations={loadMoreConversations}
-                          isLoading={isFetchingNextPage || showLoading || isLoading}
-                          isSearchLoading={isSearchLoading}
-                        />
-                      </div>
-                      <Suspense fallback={null}>
-                        <AccountSettings />
-                      </Suspense>
-                    </nav>
-                  )}
+                  <nav
+                    id="chat-history-nav"
+                    aria-label={localize('com_ui_chat_history')}
+                    className="flex h-full flex-col px-2 pb-3.5 md:px-3"
+                  >
+                    <div className="flex flex-1 flex-col" ref={outerContainerRef}>
+                      <MemoNewChat
+                        subHeaders={subHeaders}
+                        toggleNav={toggleNavVisible}
+                        headerButtons={headerButtons}
+                        isSmallScreen={isSmallScreen}
+                      />
+                      <Conversations
+                        conversations={conversations}
+                        moveToTop={moveToTop}
+                        toggleNav={itemToggleNav}
+                        containerRef={listRef}
+                        loadMoreConversations={loadMoreConversations}
+                        isLoading={isFetchingNextPage || showLoading || isLoading}
+                        isSearchLoading={isSearchLoading}
+                      />
+                    </div>
+                    <Suspense fallback={null}>
+                      <AccountSettings />
+                    </Suspense>
+                  </nav>
                 </div>
               </div>
             </motion.div>
diff --git a/client/src/components/Nav/NewChat.tsx b/client/src/components/Nav/NewChat.tsx
index 29453d2b58..7be3bfc0ad 100644
--- a/client/src/components/Nav/NewChat.tsx
+++ b/client/src/components/Nav/NewChat.tsx
@@ -3,6 +3,7 @@ import { useNavigate } from 'react-router-dom';
 import { QueryKeys } from 'librechat-data-provider';
 import { useQueryClient } from '@tanstack/react-query';
 import { TooltipAnchor, NewChatIcon, MobileSidebar, Sidebar, Button } from '@librechat/client';
+import { CLOSE_SIDEBAR_ID, OPEN_SIDEBAR_ID } from '~/components/Chat/Menus/OpenSidebar';
 import { useLocalize, useNewConvo } from '~/hooks';
 import { clearMessagesCache } from '~/utils';
 import store from '~/store';
@@ -13,16 +14,12 @@ export default function NewChat({
   subHeaders,
   isSmallScreen,
   headerButtons,
-  openSidebarRef,
-  closeSidebarRef,
 }: {
   index?: number;
   toggleNav: () => void;
   isSmallScreen?: boolean;
   subHeaders?: React.ReactNode;
   headerButtons?: React.ReactNode;
-  openSidebarRef?: React.RefObject<HTMLButtonElement>;
-  closeSidebarRef?: React.RefObject<HTMLButtonElement>;
 }) {
   const queryClient = useQueryClient();
   /** Note: this component needs an explicit index passed if using more than one */
@@ -33,10 +30,11 @@ export default function NewChat({
 
   const handleToggleNav = useCallback(() => {
     toggleNav();
-    requestAnimationFrame(() => {
-      openSidebarRef?.current?.focus();
-    });
-  }, [toggleNav, openSidebarRef]);
+    // Delay focus until after the sidebar animation completes (200ms)
+    setTimeout(() => {
+      document.getElementById(OPEN_SIDEBAR_ID)?.focus();
+    }, 250);
+  }, [toggleNav]);
 
   const clickHandler: React.MouseEventHandler<HTMLButtonElement> = useCallback(
     (e) => {
@@ -62,7 +60,7 @@ export default function NewChat({
           description={localize('com_nav_close_sidebar')}
           render={
             <Button
-              ref={closeSidebarRef}
+              id={CLOSE_SIDEBAR_ID}
               size="icon"
               variant="outline"
               data-testid="close-sidebar-button"
diff --git a/client/src/routes/Root.tsx b/client/src/routes/Root.tsx
index 74ff44329d..4c12d46441 100644
--- a/client/src/routes/Root.tsx
+++ b/client/src/routes/Root.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Outlet } from 'react-router-dom';
 import type { ContextType } from '~/common';
 import {
@@ -28,8 +28,6 @@ export default function Root() {
     const savedNavVisible = localStorage.getItem('navVisible');
     return savedNavVisible !== null ? JSON.parse(savedNavVisible) : true;
   });
-  const openSidebarRef = useRef<HTMLButtonElement>(null);
-  const closeSidebarRef = useRef<HTMLButtonElement>(null);
 
   const { isAuthenticated, logout } = useAuthContext();
 
@@ -75,24 +73,10 @@ export default function Root() {
               <Banner onHeightChange={setBannerHeight} />
               <div className="flex" style={{ height: `calc(100dvh - ${bannerHeight}px)` }}>
                 <div className="relative z-0 flex h-full w-full overflow-hidden">
-                  <Nav
-                    navVisible={navVisible}
-                    setNavVisible={setNavVisible}
-                    openSidebarRef={openSidebarRef}
-                    closeSidebarRef={closeSidebarRef}
-                  />
+                  <Nav navVisible={navVisible} setNavVisible={setNavVisible} />
                   <div className="relative flex h-full max-w-full flex-1 flex-col overflow-hidden">
                     <MobileNav navVisible={navVisible} setNavVisible={setNavVisible} />
-                    <Outlet
-                      context={
-                        {
-                          navVisible,
-                          setNavVisible,
-                          openSidebarRef,
-                          closeSidebarRef,
-                        } satisfies ContextType
-                      }
-                    />
+                    <Outlet context={{ navVisible, setNavVisible } satisfies ContextType} />
                   </div>
                 </div>
               </div>