diff --git a/DBObj/SongList.cs b/DBObj/SongList.cs
index 40f7e65..1e8ca31 100644
--- a/DBObj/SongList.cs
+++ b/DBObj/SongList.cs
@@ -102,7 +102,7 @@ namespace DBObj
 
         public static void Cancel(SongData song)
         {
-            if (song.GetState() == PlayState.NotPlayed)
+            if (song.GetState() == PlayState.NotPlayed||song.GetState() ==PlayState.InsertPlayback)
             { 
                 not_played.Remove(song);
                 song.SetState(PlayState.Skipped);
diff --git a/PrimaryFormParts/PrimaryForm.VodScreen.cs b/PrimaryFormParts/PrimaryForm.VodScreen.cs
index dda006c..8ce833a 100644
--- a/PrimaryFormParts/PrimaryForm.VodScreen.cs
+++ b/PrimaryFormParts/PrimaryForm.VodScreen.cs
@@ -121,6 +121,7 @@ namespace DualScreenDemo
         {
             SetVodScreenPictureBoxAndButtonsVisibility(false);
             SongList.Insert(currentSelectedSong);
+            if (isOnOrderedSongsPage) orderedSongsButton.PerformClick();
         }
 
         private void AlbumButton_Click(object sender, EventArgs e)