diff --git a/gui/main.js b/gui/main.js
index 698c86e4..4dd22d3f 100644
--- a/gui/main.js
+++ b/gui/main.js
@@ -560,7 +560,13 @@ ipcMain.on("select-user-image", (event, data) => {
 // read files in folder - use case "shared folder"
 ipcMain.on("read-files-in-folder", (event, data) => {
   let fileList = [];
-
+if (config["enable_request_shared_folder"].toLowerCase() == "false") {
+  //mainLog.info("Shared file folder is disable, not populating fileList");
+  chat.webContents.send("return-shared-folder-files", {
+    files: fileList,
+  });
+  return;
+}
   let folder = data.folder;
   let files = fs.readdirSync(folder);
   console.log(folder);
diff --git a/gui/preload-main.js b/gui/preload-main.js
index b6794935..6db3ec30 100644
--- a/gui/preload-main.js
+++ b/gui/preload-main.js
@@ -1113,7 +1113,9 @@ window.addEventListener("DOMContentLoaded", () => {
         config.enable_request_shared_folder = "False";
       }
       //fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
-      FD.saveConfig(config, configPath);
+      FD.saveConfig(config,configPath);
+      //Update file list after setting change
+      ipcRenderer.send("read-files-in-folder",{folder: config.shared_folder_path.toString()});
     });
 
   // enable enable_request_profile switch clicked