diff --git a/PKHeX.Core/Game/GameStrings/GameLanguage.cs b/PKHeX.Core/Game/GameStrings/GameLanguage.cs
index 8cd4bfa79..61fef2f46 100644
--- a/PKHeX.Core/Game/GameStrings/GameLanguage.cs
+++ b/PKHeX.Core/Game/GameStrings/GameLanguage.cs
@@ -13,6 +13,11 @@ public static class GameLanguage
 
         public static int LanguageCount => LanguageCodes.Length;
 
+        /// <summary>
+        /// Gets the language from the requested 2-char <see cref="lang"/> code.
+        /// </summary>
+        /// <param name="lang">2 character language code</param>
+        /// <returns>Index of the language code; if not a valid language code, returns the <see cref="DefaultLanguageIndex"/>.</returns>
         public static int GetLanguageIndex(string lang)
         {
             int l = Array.IndexOf(LanguageCodes, lang);
diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs
index 8894ba7c1..690756bd4 100644
--- a/PKHeX.WinForms/MainWindow/Main.cs
+++ b/PKHeX.WinForms/MainWindow/Main.cs
@@ -292,10 +292,7 @@ private void FormInitializeSecond()
             #endif
 
             // Select Language
-            int lang = GameLanguage.GetLanguageIndex(settings.Language);
-            if (lang < 0)
-                lang = GameLanguage.DefaultLanguageIndex;
-            CB_MainLanguage.SelectedIndex = lang;
+            CB_MainLanguage.SelectedIndex = GameLanguage.GetLanguageIndex(settings.Language);
         }
 
         private void FormLoadPlugins()