diff --git a/app/playlists.py b/app/playlists.py
index a408df6..0609a9c 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -704,6 +704,14 @@ class PlaylistTab(QTableWidget):
         # Queue up time calculations to take place after UI has
         # updated
         self._update_start_end_times(session)
+        # It's possible that the current/next tracks are in this
+        # playlist, so check and set.
+        current_row = self._get_current_track_row_number()
+        if current_row is not None:
+            self._set_row_colour_current(current_row)
+        next_row = self._get_next_track_row_number()
+        if next_row is not None:
+            self._set_row_colour_next(next_row)
         # Needed to wrap notes column correctly - add to event queue so
         # that it's processed after list is populated
         QTimer.singleShot(0, self.tab_visible)