From ae53207148d636475abef21853a3d35f5b934423 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Wed, 5 Jan 2022 20:45:18 +0530
Subject: [PATCH] fix remixd initial load

---
 libs/remix-ui/workspace/src/lib/reducers/workspace.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libs/remix-ui/workspace/src/lib/reducers/workspace.ts b/libs/remix-ui/workspace/src/lib/reducers/workspace.ts
index 46b8b47f53..613c1db3b7 100644
--- a/libs/remix-ui/workspace/src/lib/reducers/workspace.ts
+++ b/libs/remix-ui/workspace/src/lib/reducers/workspace.ts
@@ -672,8 +672,12 @@ const fetchDirectoryContent = (state: BrowserState, payload: { fileTree, path: s
       return files
     }
   } else {
-    if (payload.path === state.mode || payload.path === '/') {
-      const files = normalize(payload.fileTree, payload.path, payload.type)
+    if (payload.path === '/') {
+      let files = normalize(payload.fileTree, payload.path, payload.type)
+      return { [state.mode]: files }
+    } else if (payload.path === state.mode) {
+      let files = normalize(payload.fileTree, payload.path, payload.type)
+      files = _.merge(files, state[state.mode].files[state.mode])
       if (deletePath) delete files[deletePath]
       return { [state.mode]: files }
     } else {