diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 99c39f0acd..f292c5c8c3 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -21,7 +21,7 @@
 #new>ul>li { height:20px; margin:.3em; padding-left:2em; padding-bottom:0.1em;
 		background-repeat:no-repeat; cursor:pointer; }
 #new>ul>li>p { cursor:pointer; }
-#new>ul>li>input { padding:0.3em; margin:-0.3em; }
+#new>ul>li>form>input { padding:0.3em; margin:-0.3em; }
 
 #upload { 
 	height:27px; padding:0; margin-left:0.2em; overflow:hidden;
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 6d1be45cdd..c795469e2d 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -477,7 +477,7 @@ $(document).ready(function() {
 		$('#new').removeClass('active');
 		$('#new li').each(function(i,element){
 			if($(element).children('p').length==0){
-				$(element).children('input').remove();
+				$(element).children('form').remove();
 				$(element).append('<p>'+$(element).data('text')+'</p>');
 			}
 		});
@@ -505,8 +505,8 @@ $(document).ready(function() {
 		var text=$(this).children('p').text();
 		$(this).data('text',text);
 		$(this).children('p').remove();
-		var input=$('<input>');
 		var form=$('<form></form>');
+		var input=$('<input>');
 		form.append(input);
 		$(this).append(form);
 		input.focus();