diff --git a/src/MediaTrackDelegate.qml b/src/MediaTrackDelegate.qml
--- a/src/MediaTrackDelegate.qml
+++ b/src/MediaTrackDelegate.qml
@@ -132,9 +132,16 @@
 
                     visible: !detailedView
 
-                    text: (artist !== albumArtist ?
-                               "<b>" + trackNumber + ' - ' + title + "</b>" + ' - <i>' + artist + '</i>' :
-                               "<b>" + trackNumber + ' - ' + title + "</b>")
+                    text: {
+                        var text = "<b>";
+
+                        text += (trackNumber > 0) ? trackNumber + "-" : "";
+                        text += title + "</b>";
+
+                        text += (artist !== albumArtist) ? " - <i>" + artist + "</i>" : "";
+
+                        return text;
+                    }
 
                     horizontalAlignment: Text.AlignLeft
 
@@ -206,7 +213,7 @@
                     LabelWithToolTip {
                         id: mainLabelDetailed
 
-                        text: trackNumber + ' - ' + title
+                        text: (trackNumber > -1) ? trackNumber + ' - ' + title : title
                         horizontalAlignment: Text.AlignLeft
 
                         font.weight: Font.Bold
diff --git a/src/MediaTrackMetadataView.qml b/src/MediaTrackMetadataView.qml
--- a/src/MediaTrackMetadataView.qml
+++ b/src/MediaTrackMetadataView.qml
@@ -55,7 +55,7 @@
             trackList.append({"name": i18nc("Album name for track metadata view", "Album:"), "content": albumName})
         if (composer.length !== 0)
             trackList.append({"name": i18nc("Composer name for track metadata view", "Composer:"), "content": composer})
-        if (trackNumber !== 0)
+        if (trackNumber > -1)
             trackList.append({"name": i18nc("Track number for track metadata view", "Track Number:"), "content": trackNumber + ""})
         if (discNumber !== 0)
             trackList.append({"name": i18nc("Disc number for track metadata view", "Disc Number:"), "content": discNumber + ""})
diff --git a/src/PlayListEntry.qml b/src/PlayListEntry.qml
--- a/src/PlayListEntry.qml
+++ b/src/PlayListEntry.qml
@@ -249,7 +249,7 @@
                     LabelWithToolTip {
                         id: mainCompactLabel
 
-                        text: (trackNumber !== -1 ? (((discNumber && !isSingleDiscAlbum) ? discNumber + ' - ' + trackNumber : trackNumber) + ' - ' + title) : title)
+                        text: (trackNumber > -1 ? (((discNumber && !isSingleDiscAlbum) ? discNumber + ' - ' + trackNumber : trackNumber) + ' - ' + title) : title)
 
                         font.weight: (isPlaying ? Font.Bold : Font.Normal)
                         color: myPalette.text