diff --git a/data/core/commands/core.lua b/data/core/commands/core.lua
index 7ac36976..215ff654 100644
--- a/data/core/commands/core.lua
+++ b/data/core/commands/core.lua
@@ -148,7 +148,9 @@ command.add(nil, {
 
   ["core:change-project-folder"] = function()
     local dirname = common.dirname(core.project_dir)
-    core.command_view:set_text(common.home_encode(dirname) .. PATHSEP)
+    if dirname then
+      core.command_view:set_text(common.home_encode(dirname) .. PATHSEP)
+    end
     core.command_view:enter("Change Project Folder", function(text, item)
       text = system.absolute_path(common.home_expand(item and item.text or text))
       if text == core.project_dir then return end