diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs
index ab9af57a3..33d13cc68 100644
--- a/PKX/f1-Main.cs
+++ b/PKX/f1-Main.cs
@@ -81,6 +81,8 @@ namespace PKHeX
             #region Localize & Populate
             InitializeStrings(); Status = "Strings set up";
             InitializeFields(); Status = "Fields set up";
+            try { CB_Language.SelectedIndex = (lang >= 0) ? main_langnum[lang] : 1; }
+            catch { }
             #endregion
             #region Add ContextMenus to the PictureBoxes (PKX slots)
 
@@ -172,9 +174,6 @@ namespace PKHeX
             Status = "Initialized!";
 
             init = true;
-            CB_Species.SelectedIndex = 1;
-            try { CB_Language.SelectedIndex = (lang >= 0) ? main_langnum[lang] : 1; }
-            catch { }
 
             // Splash Screen closes on its own.
             this.BringToFront();
@@ -872,6 +871,7 @@ namespace PKHeX
                 TB_OT.Text = "PKHeX";
                 TB_TID.Text = 12345.ToString();
                 TB_SID.Text = 54321.ToString();
+                CB_Species.SelectedIndex = 1;
                 CB_GameOrigin.SelectedIndex = 0;
                 CB_Language.SelectedIndex = 0;
                 C_BoxSelect.SelectedIndex = 0;
diff --git a/Resources/text/changelog.txt b/Resources/text/changelog.txt
index f2c410118..106965036 100644
--- a/Resources/text/changelog.txt
+++ b/Resources/text/changelog.txt
@@ -491,7 +491,7 @@ http://projectpokemon.org/forums/showthread.php?36986
  - Added: Boot Status to help debug some users being stuck on the splash screen.
  - Added: Event Constant editing to Event Flag window.
 
-3/1/15 - New Update: (570)
+3/1/15 - New Update: (4000)
  - Added: QR Code Generation; click "QR!" and a QR window will appear with a scannable image. Requires an active internet connection.
  - Added: QR Code to Tabs; hold ALT when clicking "QR!" after copying the URL of the QR to your clipboard (CTRL-C). Requires internet.
  - Added: Decrypted Battle Video scraping for ek6 data; battle stats are not kept.
@@ -511,4 +511,5 @@ http://projectpokemon.org/forums/showthread.php?36986
  - Changed: Window sizing for mono compatibility on Inventory and other editors. Thanks SoujiSeta!
  - Changed: Chinese Translation text improved. Thanks piva223!
  - Changed: ' will be replaced with the ingame ’. Thanks supercarotte!
- - Hotfix: Changing ID/SID & Gender will refresh the preview.
\ No newline at end of file
+ - Hotfix: Changing ID/SID & Gender will refresh the preview.
+ - Hotfix: Opening the program via a loaded pkx/ekx will properly load the Species/Language. Thanks rskoopa!
\ No newline at end of file