diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 20eb5fd083..be42a0056d 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -142,7 +142,13 @@ table td.filename a.name {
 	padding: 0;
 }
 table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; }
-table td.filename input.filename { width:100%; cursor:text; }
+table td.filename input.filename {
+	width: 80%;
+	font-size: 14px;
+	margin-top: 8px;
+	margin-left: 2px;
+	cursor: text;
+}
 table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em .3em; }
 table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0; }
 
@@ -176,7 +182,7 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
 	filter: alpha(opacity=0);
 	opacity: 0;
 	float: left;
-	margin: 32px 0 0 32px; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/
+	margin: 32px 0 4px 32px; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/
 }
 /* Show checkbox when hovering, checked, or selected */
 #fileList tr:hover td.filename>input[type="checkbox"]:first-child,
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 536becad49..10a297ddad 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -199,7 +199,7 @@ var FileList={
 		tr=$('tr').filterAttr('data-file',name);
 		tr.data('renaming',true);
 		td=tr.children('td.filename');
-		input=$('<input class="filename"/>').val(name);
+		input=$('<input type="text" class="filename"/>').val(name);
 		form=$('<form></form>');
 		form.append(input);
 		td.children('a.name').hide();