diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index caebb5151d..620fe8606b 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -55,7 +55,7 @@
 	font-size:1.5em; font-weight:bold;
 	color:#888; text-shadow:#fff 0 1px 0;
 }
-table { position:relative; width:100%; }
+table { position:relative; top:37px; width:100%; }
 tbody tr { background-color:#fff; height:2.5em; }
 tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; }
 tbody tr.selected { background-color:#eee; }
@@ -73,9 +73,9 @@ table th#headerSize, table td.filesize { min-width:3em; padding:0 1em; text-alig
 table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text-align:left; }
 
 /* Multiselect bar */
-table.multiselect thead { position:fixed; z-index:1; }
+table.multiselect { top:63px; }
+table.multiselect thead { position:fixed; top:82px; z-index:1; }
 table.multiselect thead th { background:rgba(230,230,230,.8); color:#000; font-weight:bold; border-bottom:0; }
-table.multiselect tbody { position: absolute; margin-top:2em; }
 table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; }
 table td.filename a.name { display:block; height:1.5em; vertical-align:middle; margin-left:3em; }
 table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; }
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 0b4aa21eac..2d4ed9ab2d 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -59,7 +59,7 @@
 	<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
 <?php endif; ?>
 
-<table class="hascontrols">
+<table>
 	<thead>
 		<tr>
 			<th id='headerName'>