diff --git a/app/playlistmodel.py b/app/playlistmodel.py
index 6719027..977e3c4 100644
--- a/app/playlistmodel.py
+++ b/app/playlistmodel.py
@@ -155,10 +155,18 @@ class PlaylistModel(QAbstractTableModel):
         if file_is_unreadable(rat.path):
             return QBrush(QColor(Config.COLOUR_UNREADABLE))
         # Current track
-        if track_sequence.current and track_sequence.current.row_number == row:
+        if (
+            track_sequence.current
+            and track_sequence.current.playlist_id == self.playlist_id
+            and track_sequence.current.row_number == row
+        ):
             return QBrush(QColor(Config.COLOUR_CURRENT_PLAYLIST))
         # Next track
-        if track_sequence.next and track_sequence.next.row_number == row:
+        if (
+            track_sequence.next
+            and track_sequence.next.playlist_id == self.playlist_id
+            and track_sequence.next.row_number == row
+        ):
             return QBrush(QColor(Config.COLOUR_NEXT_PLAYLIST))
 
         # Individual cell colouring