diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 232b47857b..363f81a1a7 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2600,7 +2600,7 @@
 				}
 
 				try {
-					var newName = input.val();
+					var newName = input.val().trim();
 					input.tooltip('hide');
 					form.remove();
 
diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js
index 69450e97c2..305af05127 100644
--- a/apps/files/js/newfilemenu.js
+++ b/apps/files/js/newfilemenu.js
@@ -167,7 +167,7 @@
 				event.preventDefault();
 
 				if (checkInput()) {
-					var newname = $input.val();
+					var newname = $input.val().trim();
 
 					/* Find the right actionHandler that should be called.
 					 * Actions is retrieved by using `actionSpec.id` */