diff --git a/preload.lua b/preload.lua
index 7cf4e7f..2f5e2f2 100644
--- a/preload.lua
+++ b/preload.lua
@@ -16,7 +16,7 @@ commander.register('cd', function (args)
 			path = path .. tostring(args[i]) .. ' '
 		end
 		path = path:gsub('$%$','\0'):gsub('${([%w_]+)}', os.getenv)
-		:gsub('$([%w_]+)', os.getenv):gsub('%z','$')
+		:gsub('$([%w_]+)', os.getenv):gsub('%z','$'):gsub('^%s*(.-)%s*$', '%1')
 
         if path == '-' then
             path = oldDir