diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
index 107385f1b..11777c11c 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
+++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
@@ -417,15 +417,22 @@ private void SetDetailsOT(ITrainerInfo tr)
 
         private void SetDetailsHT(ITrainerInfo tr)
         {
-            if (string.IsNullOrWhiteSpace(tr.OT))
+            var trainer = tr.OT;
+            if (trainer.Length == 0)
                 return;
 
-            if (TB_HT.Text.Length > 0)
+            if (!tr.IsOriginalHandler(Entity, false))
             {
+                TB_HT.Text = trainer;
                 UC_HTGender.Gender = tr.Gender & 1;
                 if (Entity is IHandlerLanguage)
                     CB_HTLanguage.SelectedValue = tr.Language;
             }
+            else if (TB_HT.Text.Length != 0)
+            {
+                if (CB_HTLanguage.SelectedIndex == 0 && Entity is IHandlerLanguage)
+                    CB_HTLanguage.SelectedValue = tr.Language;
+            }
         }
 
         private void SetForms()