diff --git a/app/musicmuster.py b/app/musicmuster.py
index 7023c74..882f0ab 100755
--- a/app/musicmuster.py
+++ b/app/musicmuster.py
@@ -361,9 +361,10 @@ class Window(QMainWindow, Ui_MainWindow):
 
         next_track_id = self.visible_playlist().set_selected_as_next()
         if next_track_id:
-            if self.next_track_playlist:
-                self.next_track_playlist.clear_next()
-            self.next_track_playlist = self.visible_playlist()
+            if self.next_track_playlist != self.visible_playlist():
+                if self.next_track_playlist:
+                    self.next_track_playlist.clear_next()
+                self.next_track_playlist = self.visible_playlist()
             self.next_track = Tracks.get_track(next_track_id)
         self.update_headers()