2 files changed, 6 insertions, 1 deletions
diff --git a/coreengine/viewdisplaytracks.c b/coreengine/viewdisplaytracks.c
index 97fee2d..067d2d6 100644
--- a/coreengine/viewdisplaytracks.c
+++ b/coreengine/viewdisplaytracks.c
@@ -110,11 +110,15 @@ void cViewTracks::SetCurrentTrack(int index) {
 void cViewTracks::Flush(bool animFlush) {
     if (init) {
         sdOsd.LockFlush();
+        if (viewList) {
+            viewList->Draw();
+            viewList->StartAnimation();
+        }
         Render((int)eVeDisplayTracks::background);
     }
     if (change) {
         Render((int)eVeDisplayTracks::header);
-        if (viewList)
+        if (viewList && !init)
             viewList->Draw();
         change = false;
     }
diff --git a/coreengine/viewlist.c b/coreengine/viewlist.c
index 1ed5432..bda1abb 100644
--- a/coreengine/viewlist.c
+++ b/coreengine/viewlist.c
@@ -937,6 +937,7 @@ void cViewListAudioTracks::PreCache(void) {
 
 void cViewListAudioTracks::SetNumtracks(int numTracks) {
     this->numTracks = numTracks;
+    this->numElements = numTracks;
     tokenContainer->Clear();
     tokenContainer->AddIntToken(0, numTracks);
 }