diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index a8dede6631..5a5a3a5d30 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -48,10 +48,6 @@
 	width: 100%;
 }
 
-#filestable.has-controls {
-	top: 44px;
-}
-
 #filestable tbody tr {
 	height: 51px;
 }
diff --git a/core/css/styles.scss b/core/css/styles.scss
index 54775f67f6..edcaeb1742 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -223,7 +223,7 @@ body {
 
 #controls {
 	box-sizing: border-box;
-	position: relative;
+	position: sticky;
 	height: 44px;
 	padding: 0;
 	margin: 0;
@@ -234,6 +234,7 @@ body {
 	-ms-user-select: none;
 	user-select: none;
 	display: flex;
+	top: 0;
 }
 
 /* position controls for apps with app-navigation */