diff --git a/Data/Scripts/016_UI/024_UI_TextEntry.rb b/Data/Scripts/016_UI/024_UI_TextEntry.rb
index 0588b23a0..947caba5f 100644
--- a/Data/Scripts/016_UI/024_UI_TextEntry.rb
+++ b/Data/Scripts/016_UI/024_UI_TextEntry.rb
@@ -731,6 +731,8 @@ class PokemonEntryScene2
             @sprites["cursor"].setCursorPos(@cursorpos)
           end
           pbUpdateOverlay
+          # Auto-switch to lowercase letters after the first uppercase letter is selected
+          pbChangeTab(1) if @mode == 0 && @helper.cursor == 1
         end
       end
     end