diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index 5d29c5348d2ef..bb2b1898aafa5 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -20,7 +20,6 @@
 
 .actions.creatable {
 	position: relative;
-	z-index: -30;
 	display: flex;
 	flex: 1 1;
 	.button:not(:last-child) {
@@ -48,10 +47,6 @@
 	width: 100%;
 }
 
-#filestable.has-controls {
-	top: 44px;
-}
-
 #filestable tbody tr {
 	height: 51px;
 }
diff --git a/core/css/mobile.scss b/core/css/mobile.scss
index 1951847998740..6f1583cb77a04 100644
--- a/core/css/mobile.scss
+++ b/core/css/mobile.scss
@@ -83,9 +83,7 @@
 
 /* position controls for apps with app-navigation */
 #app-navigation+#app-content #controls {
-	left: 0 !important;
 	padding-left: 44px;
-	width: 100%;
 }
 
 /* .viewer-mode is when text editor, PDF viewer, etc is open */
diff --git a/core/css/styles.scss b/core/css/styles.scss
index 5474b41a2b47f..0ae5f45a3eb7b 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -223,12 +223,9 @@ body {
 
 #controls {
 	box-sizing: border-box;
-	position: fixed;
-	top: 45px;
-	right: 0;
-	left: 0;
+	position: -webkit-sticky;
+	position: sticky;
 	height: 44px;
-	width: calc(100% - 250px);
 	padding: 0;
 	margin: 0;
 	background-color: rgba($color-main-background, 0.95);
@@ -237,15 +234,12 @@ body {
 	-moz-user-select: none;
 	-ms-user-select: none;
 	user-select: none;
-	display: inline-flex;
+	display: flex;
+	top: 0;
 }
 
 /* position controls for apps with app-navigation */
 
-#app-navigation + #app-content #controls {
-	left: 250px;
-}
-
 .viewer-mode #app-navigation + #app-content #controls {
 	left: 0;
 }