diff --git a/look-and-feel/contents/lockscreen/LockScreen.qml b/look-and-feel/contents/lockscreen/LockScreen.qml
index e98d94e9..bbc89965 100644
--- a/look-and-feel/contents/lockscreen/LockScreen.qml
+++ b/look-and-feel/contents/lockscreen/LockScreen.qml
@@ -95,6 +95,7 @@ PlasmaCore.ColorScope {
     ColumnLayout {
         id: phoneClockComponent
         visible: !isWidescreen
+        z: passwordFlickable.contentY === 0 ? 5 : 0 // in front of password flickable when closed
         
         anchors {
             top: parent.top
@@ -129,7 +130,6 @@ PlasmaCore.ColorScope {
             Layout.minimumWidth: units.gridUnit * 15
             Layout.leftMargin: units.gridUnit
             Layout.rightMargin: units.gridUnit
-            z: 5
         }
     }
     
@@ -144,6 +144,7 @@ PlasmaCore.ColorScope {
             left: parent.left
             leftMargin: units.gridUnit * 3
         }
+        z: passwordFlickable.contentY === 0 ? 5 : 0 // in front of password flickable when closed
         
         ColumnLayout {
             id: tabletLayout
@@ -162,7 +163,6 @@ PlasmaCore.ColorScope {
                 Layout.fillWidth: true
                 Layout.maximumWidth: units.gridUnit * 25
                 Layout.minimumWidth: units.gridUnit * 20
-                z: 5
             }
         }
     }
diff --git a/look-and-feel/contents/lockscreen/MediaControls.qml b/look-and-feel/contents/lockscreen/MediaControls.qml
index 8e07a6dd..fe2c8ecb 100644
--- a/look-and-feel/contents/lockscreen/MediaControls.qml
+++ b/look-and-feel/contents/lockscreen/MediaControls.qml
@@ -151,7 +151,6 @@ Item {
             Layout.preferredWidth: height // make this button bigger
             icon.name: mpris2Source.playing ? "media-playback-pause" : "media-playback-start"
             onClicked: {
-                console.log("Fooo");
 //                 fadeoutTimer.running = false
                 mpris2Source.playPause()
             }