diff --git a/nymea-app/ui/components/MediaBrowser.qml b/nymea-app/ui/components/MediaBrowser.qml
index 708ffcbe..765c71db 100644
--- a/nymea-app/ui/components/MediaBrowser.qml
+++ b/nymea-app/ui/components/MediaBrowser.qml
@@ -96,6 +96,7 @@ Item {
                 id: listView
                 model: browserItems
                 ScrollBar.vertical: ScrollBar {}
+                clip: true
 
                 property string nodeId: ""
 
diff --git a/nymea-app/ui/components/MediaPlayer.qml b/nymea-app/ui/components/MediaPlayer.qml
index cb50b78b..54828228 100644
--- a/nymea-app/ui/components/MediaPlayer.qml
+++ b/nymea-app/ui/components/MediaPlayer.qml
@@ -394,7 +394,11 @@ Item {
             function show() { y = 0 }
             function hide() { y = root.height }
 
-            header: ToolBar {
+            header: Rectangle {
+                height: Style.smallDelegateHeight
+                width: parent.width
+                color: Style.tileBackgroundColor
+
                 RowLayout {
                     anchors.fill: parent
                     HeaderButton {