diff --git a/DBObj/SongList.cs b/DBObj/SongList.cs
index 08e41fb..40f7e65 100644
--- a/DBObj/SongList.cs
+++ b/DBObj/SongList.cs
@@ -102,9 +102,13 @@ namespace DBObj
 
         public static void Cancel(SongData song)
         {
-            not_played.Remove(song);
-            song.SetState(PlayState.Skipped);
-            played.Add(song);
+            if (song.GetState() == PlayState.NotPlayed)
+            { 
+                not_played.Remove(song);
+                song.SetState(PlayState.Skipped);
+                played.Add(song);
+            }
+
         }
 
         public static void Insert(SongData song)
diff --git a/PrimaryFormParts/PrimaryForm.VodScreen.cs b/PrimaryFormParts/PrimaryForm.VodScreen.cs
index 3e05bda..8f87b1a 100644
--- a/PrimaryFormParts/PrimaryForm.VodScreen.cs
+++ b/PrimaryFormParts/PrimaryForm.VodScreen.cs
@@ -104,7 +104,7 @@ namespace DualScreenDemo
             if (isOnOrderedSongsPage)
             {
                 SetVodScreenPictureBoxAndButtonsVisibility(false);
-                if(currentSelectedSong.GetState()!=PlayState.Playing)SongList.Cancel(currentSelectedSong);
+                SongList.Cancel(currentSelectedSong);
                 orderedSongsButton.PerformClick();
             }
             else
@@ -129,7 +129,7 @@ namespace DualScreenDemo
             /*var selectedSongs = allSongs.Where(song => song.ArtistA == currentSelectedSong.ArtistA)
                             .OrderByDescending(song => song.AddedTime)
                             .ToList();*/
-
+            isOnOrderedSongsPage = false;
             UpdateSongList(selectedSongs);
             SetVodScreenPictureBoxAndButtonsVisibility(false);
         }