diff --git a/app/musicmuster.py b/app/musicmuster.py
index eb06f11..41c805d 100755
--- a/app/musicmuster.py
+++ b/app/musicmuster.py
@@ -612,15 +612,16 @@ class Window(QMainWindow, Ui_MainWindow):
         # doesn't see player=None and kick off end-of-track actions
         self.playing = False
 
-        # Repaint playlist to remove currently playing track colour
-        with Session() as session:
-            self.current_track.playlist_tab.update_display(session)
-
         # Reset PlaylistTrack objects
         if self.current_track.track_id:
             self.previous_track = self.current_track
             self.current_track = PlaylistTrack()
 
+        # Repaint playlist to remove currently playing track colour
+        # What was current track is now previous track
+        with Session() as session:
+            self.previous_track.playlist_tab.update_display(session)
+
         # Reset clocks
         self.frame_fade.setStyleSheet("")
         self.frame_silent.setStyleSheet("")