diff --git a/src/qml/MediaTrackDelegate.qml b/src/qml/MediaTrackDelegate.qml
--- a/src/qml/MediaTrackDelegate.qml
+++ b/src/qml/MediaTrackDelegate.qml
@@ -213,14 +213,7 @@
                     LabelWithToolTip {
                         id: mainLabelDetailed
 
-                        text: {
-                            if (dataHelper.hasValidTrackNumber()) {
-                                return i18nc("%1: track number. %2: track title", "%1 - %2",
-                                             Number(dataHelper.trackNumber).toLocaleString(Qt.locale(), 'f', 0), dataHelper.title);
-                            } else {
-                                return dataHelper.title;
-                            }
-                        }
+                        text: dataHelper.title
 
                         horizontalAlignment: Text.AlignLeft
 
@@ -243,7 +236,17 @@
                     LabelWithToolTip {
                         id: artistLabel
 
-                        text: (isSingleDiscAlbum ? dataHelper.artist + ' - ' + dataHelper.albumName : dataHelper.artist + ' - ' + dataHelper.albumName + ' - CD ' + dataHelper.discNumber)
+                        text: {
+                            var text = dataHelper.artist + ' - ' + dataHelper.albumName
+                            if (dataHelper.hasValidTrackNumber()) {
+                                text += ' - ' + Number(dataHelper.trackNumber).toLocaleString(Qt.locale(), 'f', 0)
+                            }
+                            if (!isSingleDiscAlbum) {
+                                text += ' - CD ' + dataHelper.discNumber
+                            }
+                            return text
+                        }
+
                         horizontalAlignment: Text.AlignLeft
 
                         font.weight: Font.Light