2 files changed, 2 insertions, 2 deletions
diff --git a/Game/Code/Screens/UScreenName.pas b/Game/Code/Screens/UScreenName.pas
index 6d3e81b4..6a5ef4c5 100644
--- a/Game/Code/Screens/UScreenName.pas
+++ b/Game/Code/Screens/UScreenName.pas
@@ -36,7 +36,7 @@ begin
 
     // check normal keys
     if (IsAlphaNumericChar(CharCode) or
-        (CharCode in [' ','-','_','!',',','<','/','*','?','''','"'])) then
+        {(CharCode in [' ','-','_','!',',','<','/','*','?','''','"']))} IsPunctuationChar(CharCode)) then
     begin
       Button[Interaction].Text[0].Text := Button[Interaction].Text[0].Text + CharCode;
       Exit;
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 7bc08148..aab4dd2a 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -256,7 +256,7 @@ begin
     //Jump to Artist/Titel
     if ((SDL_ModState and KMOD_LALT <> 0) AND (Mode = smNormal)) then
     begin
-      if (WideCharUpperCase(CharCode)[1] in ['A'..'Z']) then
+      if (WideCharUpperCase(CharCode)[1] in ([WideChar('A')..WideChar('Z')]) ) then
       begin
         Letter := WideCharUpperCase(CharCode)[1];
         I2 := Length(CatSongs.Song);