diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs
index 42fb3b06..c336e187 100644
--- a/Vocaluxe/Screens/CScreenSong.cs
+++ b/Vocaluxe/Screens/CScreenSong.cs
@@ -63,7 +63,7 @@ namespace Vocaluxe.Screens
                 {
                     JumpTo(KeyEvent.Unicode);
                     return true;
-                }*/
+                } */
             }
             else
             {
@@ -304,11 +304,10 @@ namespace Vocaluxe.Screens
                 id = CSongs.VisibleSongs[song].ID;
             }
 
-            // here is a fault: SetSelectedSong should point to the visible index
-            Vocaluxe.Lib.Song.CSong s = Array.Find<Vocaluxe.Lib.Song.CSong>(CSongs.VisibleSongs, element => element.Artist.StartsWith(Letter.ToString(), StringComparison.OrdinalIgnoreCase));
-            if (s != null && s.ID > -1)
+            int visibleID = Array.FindIndex<Vocaluxe.Lib.Song.CSong>(CSongs.VisibleSongs, element => element.Artist.StartsWith(Letter.ToString(), StringComparison.OrdinalIgnoreCase));
+            if (visibleID > -1)
             {
-                id = s.ID;
+                id = visibleID;
                 SongMenus[htSongMenus(SongMenu)].SetSelectedSong(id);
             }
         }
@@ -345,4 +344,4 @@ namespace Vocaluxe.Screens
             SongMenus[htSongMenus(SongMenu)].OnShow();
         }
     }
-}
+}
\ No newline at end of file