diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index 8639f9d2a4..a006cce1ce 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -137,7 +137,7 @@ class vfs_widget
 					{
 						if ($n < count($comps)-1 || $mime == egw_vfs::DIR_MIME_TYPE)
 						{
-							$value['l'.$n] = '/index.php?menuaction=filemanager.filemanager_ui.index&path='.$path;
+							$value['l'.$n] = '/index.php?menuaction=filemanager.filemanager_ui.index&path='.urlencode($path);
 							$target = '';
 						}
 						else
diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index dbb5b0753d..5e27d8b459 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -992,7 +992,7 @@ class egw_vfs extends vfs_stream_wrapper
 		{
 			$path = parse_url($path,PHP_URL_PATH);
 		}
-		return '/webdav.php'.$path;
+		return '/webdav.php'.strtr($path,array('%' => '%25','+' => '%2B',' ' => '%20'));
 	}
 
 	/**