diff --git a/js/filebrowser.js b/js/filebrowser.js
index aae6cdf7720b4cad86b05e913a1be111bc9ae023..1ad37ebcf3f60bfe2304eb3d29ed36f7d9473a3f 100644
--- a/js/filebrowser.js
+++ b/js/filebrowser.js
@@ -555,7 +555,7 @@ sizeFormat=function(size){
 }
 
 OC_FILES.browser.showImage=function(dir,file){
-	var path=WEBROOT+'/files/open_file.php?dir='+dir+'&file='+file
+	var path=WEBROOT+'/files/open_file.php?dir='+encodeURIComponent(dir)+'&file='+encodeURIComponent(file);
 	var div=document.createElement('div');
 	div.setAttribute('id','imageframe');
 	div.addEvent('onclick',OC_FILES.browser.hideImage)
diff --git a/js/lib_files.js b/js/lib_files.js
index 68c3c61129105c37663413add3ca4cfb5a505605..0f601cff65d7b7aad318cf8035895f2955400519 100644
--- a/js/lib_files.js
+++ b/js/lib_files.js
@@ -75,7 +75,7 @@ OC_FILES.getdirectorycontent=function(dir,callback,refresh){
 			OC_FILES.getdirectorycontent_callback=callback;
 		}
 		OC_FILES.xmlloader.setCallBack(OC_FILES.getdirectorycontent_parse);
-		OC_FILES.xmlloader.load('files/get_files.php?dir='+dir);
+		OC_FILES.xmlloader.load('files/get_files.php?dir='+encodeURIComponent(dir));
 	}else{
 		var files=OC_FILES.cache.files
 		if(OC_FILES.cache.incomplete[OC_FILES.dir]){