diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
index 55f65a0d..b3ab25d5 100644
--- a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
+++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
@@ -449,6 +449,7 @@ namespace VocaluxeLib.Menu.SongMenu
                 _SelectionNr = categoryNr;
             else
                 _SelectionNr = -1;
+            _PreviewNr = _SelectionNr;
         }
 
         public virtual void UnloadTextures() {}
@@ -547,6 +548,11 @@ namespace VocaluxeLib.Menu.SongMenu
             _PreviewVideoStream = -1;
 
             CBase.Drawing.RemoveTexture(ref _Vidtex);
+
+            //Make sure we don't have a preview here otherwise a change won't be recognized
+            //(e.g. leave a category with one song and set preview to 0 --> previewOld=previewNew=0 --> No change --> Old data shown
+            //Use internal nr because this function gets called from withing setPreviewNr
+            _PreviewNrInternal = -1;
         }
 
         #region ThemeEdit
diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
index e6c0b94e..2683f6f8 100644
--- a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+++ b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
@@ -498,7 +498,6 @@ namespace VocaluxeLib.Menu.SongMenu
         {
             base._EnterCategory(categoryNr);
 
-            _PreviewNr = 0;
             SetSelectedSong(0);
             _UpdateListIfRequired();
         }
@@ -507,7 +506,6 @@ namespace VocaluxeLib.Menu.SongMenu
         {
             base._LeaveCategory();
 
-            _PreviewNr = 0;
             SetSelectedCategory(0);
             _UpdateListIfRequired();
         }