diff --git a/frontend/src/hooks/useFileNavigation.js b/frontend/src/hooks/useFileNavigation.js
index e98eb95..ed4ff76 100644
--- a/frontend/src/hooks/useFileNavigation.js
+++ b/frontend/src/hooks/useFileNavigation.js
@@ -25,6 +25,9 @@ export const useFileNavigation = () => {
   // Load last opened file when workspace changes
   useEffect(() => {
     const initializeFile = async () => {
+      setSelectedFile(DEFAULT_FILE.path);
+      setIsNewFile(true);
+
       const lastFile = await loadLastOpenedFile();
       if (lastFile) {
         handleFileSelect(lastFile);
@@ -33,7 +36,9 @@ export const useFileNavigation = () => {
       }
     };
 
-    initializeFile();
+    if (currentWorkspace) {
+      initializeFile();
+    }
   }, [currentWorkspace, loadLastOpenedFile, handleFileSelect]);
 
   return { selectedFile, isNewFile, handleFileSelect };