diff --git a/src/PlayListEntry.qml b/src/PlayListEntry.qml
--- a/src/PlayListEntry.qml
+++ b/src/PlayListEntry.qml
@@ -65,7 +65,7 @@
         id: playNow
         text: i18nc("Play now current track from play list", "Play Now")
         iconName: "media-playback-start"
-        enabled: !isPlaying && isValid
+        enabled: !(isPlaying == MediaPlayList.IsPlaying) && isValid
         onTriggered: {
             playListControler.switchTo(viewAlbumDelegate.index)
             viewAlbumDelegate.startPlayback()
@@ -83,6 +83,14 @@
 
         focus: true
 
+        MouseArea {
+            anchors.fill: parent
+            onDoubleClicked:  {
+                playListControler.switchTo(viewAlbumDelegate.index)
+                viewAlbumDelegate.startPlayback()
+            }
+        }
+
         ColumnLayout {
             spacing: 0
 
@@ -212,14 +220,13 @@
                         font.weight: (isPlaying ? Font.Bold : Font.Normal)
                         color: myPalette.text
 
+                        Layout.maximumWidth: mainCompactLabel.implicitWidth+1
                         Layout.fillWidth: true
                         Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-
                         visible: isValid
 
                         elide: Text.ElideRight
                     }
-
                     LabelWithToolTip {
                         id: mainInvalidCompactLabel
 
@@ -236,34 +243,6 @@
                         elide: Text.ElideRight
                     }
 
-                    Item { Layout.fillWidth: true }
-
-                    ToolButton {
-                        id: playNowButton
-
-                        implicitHeight: elisaTheme.smallDelegateToolButtonSize
-                        implicitWidth: elisaTheme.smallDelegateToolButtonSize
-
-                        opacity: 0
-
-                        visible: opacity > 0.1
-                        action: playNow
-                        Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-                    }
-
-                    ToolButton {
-                        id: removeButton
-
-                        implicitHeight: elisaTheme.smallDelegateToolButtonSize
-                        implicitWidth: elisaTheme.smallDelegateToolButtonSize
-
-                        opacity: 0
-
-                        visible: opacity > 0.1
-                        action: removeFromPlayList
-                        Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-                    }
-
                     Image {
                         id: playIcon
 
@@ -314,6 +293,37 @@
                         }
                     }
 
+                    Item {
+                        Layout.fillWidth: true
+                        Layout.preferredWidth: 0
+                    }
+
+                    ToolButton {
+                        id: playNowButton
+
+                        implicitHeight: elisaTheme.smallDelegateToolButtonSize
+                        implicitWidth: elisaTheme.smallDelegateToolButtonSize
+
+                        opacity: 0
+
+                        visible: opacity > 0.1
+                        action: playNow
+                        Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+                    }
+
+                    ToolButton {
+                        id: removeButton
+
+                        implicitHeight: elisaTheme.smallDelegateToolButtonSize
+                        implicitWidth: elisaTheme.smallDelegateToolButtonSize
+
+                        opacity: 0
+
+                        visible: opacity > 0.1
+                        action: removeFromPlayList
+                        Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+                    }
+
                     RatingStar {
                         id: ratingWidget