diff --git a/OpenDiablo2.Scenes/SelectHeroClass.cs b/OpenDiablo2.Scenes/SelectHeroClass.cs
index 10473dca..9f39ea17 100644
--- a/OpenDiablo2.Scenes/SelectHeroClass.cs
+++ b/OpenDiablo2.Scenes/SelectHeroClass.cs
@@ -336,7 +336,7 @@ namespace OpenDiablo2.Scenes
                 return;
             }
 
-            if (characterNameTextBox.Text.Length >= 15)
+            if (characterNameTextBox.Text.Length >= 15 || !selectedHero.HasValue)
                 return;
 
             if (!"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".Contains(charcode))