diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 52486df91c976a6f1f95032f3b4c9432219a3f8c..cfaeca1a06b05f1b97119569440642955d94df90 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1419,7 +1419,8 @@
 				}
 			}
 
-			return path.toLowerCase().indexOf(decodeURI('%0a')) === -1;
+			return path.toLowerCase().indexOf(decodeURI('%0a')) === -1 &&
+				path.toLowerCase().indexOf(decodeURI('%00')) === -1;
 		},
 
 		/**
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 9180b032301c8b7c6e6b7613eedfeb63fe80b75a..304f8438a5994a8ea9f353e14f47fe3682b7a7d5 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -1402,6 +1402,7 @@ describe('OCA.Files.FileList tests', function() {
 				'/abc/../',
 				'/../abc/',
 				'/foo%0Abar/',
+				'/foo%00bar/',
 				'/another\\subdir/../foo\\../bar\\..\\file/..\\folder/../'
 			], function(path) {
 				fileList.changeDirectory(decodeURI(path));