diff --git a/css/app/music-controls.css b/css/app/music-controls.css
index 5e552fa5d..9f0a1f873 100644
--- a/css/app/music-controls.css
+++ b/css/app/music-controls.css
@@ -7,13 +7,13 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
  * @copyright Morris Jobke 2013, 2014
- * @copyright Pauli Järvinen 2017 - 2024
+ * @copyright Pauli Järvinen 2017 - 2025
  */
 
 #controls {
 	height: 66px;
 	padding: 0 20px 0 20px;
-	top: 45px;
+	top: 0;
 	position: fixed;
 	overflow: visible;
 	background-color: var(--color-main-background-translucent, rgba(255, 255, 255, .95));
@@ -23,19 +23,6 @@
 	border-top-right-radius: var(--body-container-radius);
 }
 
-/* Rule used when collapsible navigation pane is open. In that case, #app-content is transformed
- * to right and this has the side-effect of making the "fixed" position to be eveluated in the
- * context of the transformed element instead of the entire window.
- */
-.snapjs-left #controls {
-	top: 0;
-}
-
-/* Adjustment to taller header pane used on NC14+ */
-body:not(.snapjs-left) #controls.taller-header {
-	top: 50px;
-}
-
 #controls, #controls * {
 	display: none;
 }
diff --git a/css/app/music-navigation.css b/css/app/music-navigation.css
index 04c94d49a..1f4103d60 100644
--- a/css/app/music-navigation.css
+++ b/css/app/music-navigation.css
@@ -17,6 +17,7 @@
 	z-index: 999;
 	overflow: unset;
 	contain: content;
+	height: 100%;
 }
 
 #app-navigation > ul {
diff --git a/css/app/music.css b/css/app/music.css
index 017ccab16..d83e6a0ea 100644
--- a/css/app/music.css
+++ b/css/app/music.css
@@ -7,7 +7,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
  * @copyright Morris Jobke 2013, 2014
- * @copyright Pauli Järvinen 2016 - 2024
+ * @copyright Pauli Järvinen 2016 - 2025
  */
 
 /**
@@ -43,6 +43,7 @@ body#body-user.dark {
 #app > div {
 	width: 100%;
 	height: 100%;
+	contain: content;
 }
 
 /* Nextcloud versions 22.2.1+ have a button min-height which messes up our layout */