diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 96dd0323d2..cf86cc6097 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -151,6 +151,10 @@ var FileList={
 			var newname=input.val();
 			if (Files.containsInvalidCharacters(newname)) {
 				return false;
+			} else if (newname.length == 0) {
+				$('#notification').text(t('files', "Name cannot be empty."));
+				$('#notification').fadeIn();
+				return false;
 			}
 			if (newname != name) {
 				if (FileList.checkName(name, newname, false)) {