diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index d0a2cce1a8..4afd7193d5 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -35,13 +35,15 @@
 }
 
 /* FILE TABLE */
-
 #filestable {
 	position: relative;
-	top: 44px;
 	width: 100%;
 }
 
+#filestable.has-controls {
+	top: 44px;
+}
+
 /* make sure there's enough room for the file actions */
 #body-user #filestable {
 	min-width: 688px; /* 768 (mobile break) - 80 (nav width) */
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 6cf82391ba..246c5bd629 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -226,7 +226,11 @@
 			}
 			this.breadcrumb = new OCA.Files.BreadCrumb(breadcrumbOptions);
 
-			this.$el.find('#controls').prepend(this.breadcrumb.$el);
+			var $controls = this.$el.find('#controls');
+			if ($controls.length > 0) {
+				$controls.prepend(this.breadcrumb.$el);
+				this.$table.addClass('has-controls');
+			}
 
 			this._renderNewButton();
 
diff --git a/apps/files/templates/simplelist.php b/apps/files/templates/simplelist.php
index 6b6c018024..ca26d9b5d5 100644
--- a/apps/files/templates/simplelist.php
+++ b/apps/files/templates/simplelist.php
@@ -1,6 +1,3 @@
-<div id="controls">
-	<div id="file_action_panel"></div>
-</div>
 <div id='notification'></div>
 
 <div id="emptycontent" class="hidden">
diff --git a/apps/files_sharing/templates/list.php b/apps/files_sharing/templates/list.php
index 55ad55a0a4..fa0365c749 100644
--- a/apps/files_sharing/templates/list.php
+++ b/apps/files_sharing/templates/list.php
@@ -1,7 +1,4 @@
 <?php /** @var $l OC_L10N */ ?>
-<div id="controls">
-	<div id="file_action_panel"></div>
-</div>
 <div id='notification'></div>
 
 <div id="emptycontent" class="hidden"></div>