diff --git a/frontend/src/hooks/documents/useFolderTree.ts b/frontend/src/hooks/documents/useFolderTree.ts
index 436aa03..c0a8917 100644
--- a/frontend/src/hooks/documents/useFolderTree.ts
+++ b/frontend/src/hooks/documents/useFolderTree.ts
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import type { Dispatch, MutableRefObject, SetStateAction } from 'react';
 import { createRootNode, DEFAULT_FOLDER_NAME } from '../../app/workspaceUtils';
 import {
@@ -102,6 +102,11 @@ const useFolderTree = ({
     selectionAnchorRef,
   } = selectionHelpers;
 
+  const focusedDocumentIdRef = useRef(focusedDocumentId);
+  useEffect(() => {
+    focusedDocumentIdRef.current = focusedDocumentId;
+  }, [focusedDocumentId]);
+
   const applySelectedFolder = useCallback(
     (folderId: FolderId, contents?: FolderContentsEntry | null) => {
       const subfolders = Array.isArray(contents?.subfolders) ? contents.subfolders : [];
@@ -136,10 +141,11 @@ const useFolderTree = ({
       });
 
       const nextFocus = (() => {
-        if (focusedDocumentId) {
-          const currentFocusedKey = createDocumentEntryKey(focusedDocumentId);
+        const currentFocusedId = focusedDocumentIdRef.current;
+        if (currentFocusedId) {
+          const currentFocusedKey = createDocumentEntryKey(currentFocusedId);
           if (currentFocusedKey && availableDocKeySet.has(currentFocusedKey)) {
-            return focusedDocumentId;
+            return currentFocusedId;
           }
         }
         if (nextDocKeys.length) {
@@ -156,7 +162,6 @@ const useFolderTree = ({
       setSelectionOrder(mergedSelection);
     },
     [
-      focusedDocumentId,
       selectionAnchorRef,
       selectionOrderRef,
       setDocuments,