diff --git a/ui/widgets/tracklist.go b/ui/widgets/tracklist.go
index d06f279..b5277ff 100644
--- a/ui/widgets/tracklist.go
+++ b/ui/widgets/tracklist.go
@@ -342,7 +342,7 @@ func (t *Tracklist) GetTracks() []*mediaprovider.Track {
 
 // Append more tracks to the tracklist.
 func (t *Tracklist) AppendTracks(trs []*mediaprovider.Track) {
-	t.tracksOrigOrder = append(t.tracks, util.ToTrackListModels(trs)...)
+	t.tracksOrigOrder = append(t.tracksOrigOrder, util.ToTrackListModels(trs)...)
 	t.doSortTracks()
 	t.list.Refresh()
 }
diff --git a/ui/widgets/tracklistloader.go b/ui/widgets/tracklistloader.go
index 461c829..cc1a235 100644
--- a/ui/widgets/tracklistloader.go
+++ b/ui/widgets/tracklistloader.go
@@ -72,7 +72,7 @@ func (t *TracklistLoader) loadMoreTracks(num int) {
 		if t.disposed.Load() {
 			return
 		}
-		fyne.Do(func() {
+		fyne.DoAndWait(func() {
 			t.tracklist.SetLoading(false)
 			t.tracklist.AppendTracks(t.trackBuffer)
 			t.len += len(t.trackBuffer)