diff --git a/data/core/init.lua b/data/core/init.lua
index 73300454..e1937c3f 100644
--- a/data/core/init.lua
+++ b/data/core/init.lua
@@ -154,12 +154,12 @@ local function project_scan_thread()
             config.max_project_files.." files according to config.max_project_files.")
         end
         dir.files = t
-        if dir.name == core.project_dir then
-          include_project_dir = true
-          core.project_files = t
-        end
         core.redraw = true
       end
+      if dir.name == core.project_dir then
+        include_project_dir = true
+        core.project_files = dir.files
+      end
     end
     if not include_project_dir then
       core.project_files = core.project_files_empty
diff --git a/data/plugins/workspace.lua b/data/plugins/workspace.lua
index b51562df..74afe658 100644
--- a/data/plugins/workspace.lua
+++ b/data/plugins/workspace.lua
@@ -168,10 +168,9 @@ local function load_workspace()
     if active_view then
       core.set_active_view(active_view)
     end
+    core.project_directories = {}
     for i, dir_name in ipairs(t.directories) do
-      if dir_name ~= "" then
-        core.add_project_directory(system.absolute_path(dir_name))
-      end
+      core.add_project_directory(system.absolute_path(dir_name))
     end
   end
 end