2 files changed, 5 insertions, 2 deletions
diff --git a/Game/Code/Screens/UScreenName.pas b/Game/Code/Screens/UScreenName.pas
index 9819b994..9db7947c 100644
--- a/Game/Code/Screens/UScreenName.pas
+++ b/Game/Code/Screens/UScreenName.pas
@@ -41,7 +41,10 @@ begin
         begin
           Ini.SaveNames;
           Music.PlayBack;
-          FadeTo(@ScreenMain);
+          if GoTo_SingScreen then
+            FadeTo(@ScreenSong)
+          else
+            FadeTo(@ScreenMain);
         end;
 
       SDLK_RETURN:
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 5c383168..1f3c7c8f 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -1169,7 +1169,7 @@ begin
     if (Ini.Tabs_at_startup = 1) AND (CatSongs.CatNumShow = -1) then
       begin
       CatSongs.ShowCategoryList;
-      SelectNext;SelectPrev; //Workaround <- must be fixed sometime
+      SelectNext; //Workaround <- must be fixed sometime
       FixSelected;
       //Show Cat in Top Left Mod
         HideCatTL;