diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index 8e83738f80..8faeb9ed85 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -988,7 +988,7 @@ function force_download(_action, _senders)
 					{
 						if ($name == 'name')
 						{
-							$to = egw_vfs::concat($content['dir'],$content['name']);
+							$to = egw_vfs::concat(egw_vfs::dirname($path),$content['name']);
 							if (file_exists(egw_vfs::PREFIX.$to) && $content['confirm_overwrite'] !== $to)
 							{
 								$tpl->set_validation_error('name',lang("There's already a file with that name!").'<br />'.
@@ -1132,7 +1132,7 @@ function force_download(_action, _senders)
 				$readonlys['perms['.$name.']'] = true;
 			}
 		}
-		$readonlys['name'] = $path == '/' || !egw_vfs::is_writable($content['dir']);
+		$readonlys['name'] = $path == '/' || !egw_vfs::is_writable(egw_vfs::dirname($path));
 		$readonlys['comment'] = !egw_vfs::is_writable($path);
 		$readonlys['tabs']['preview'] = $readonlys['tabs']['perms'] = $content['is_link'];