X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=d7e5016a54a7a71c0ea09416b53841db89fd4ac3;hp=95f05bf10b337eae5f82094f27ca0a2bb5d79573;hb=055f4e73fec400660f72d49bb1d4191cc98344de;hpb=3915df993ef01086469a8a7f575b2525e9887f65

diff --git a/src/screens.c b/src/screens.c
index 95f05bf1..d7e5016a 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -4260,12 +4260,16 @@ static void HandleTypeNameExt(boolean initialize, Key key)
   }
   else if (key == KSYM_Return)
   {
+    StopTextInput();
+
     setTypeNameValues(name, pos, TRUE);
 
     active = FALSE;
   }
   else if (key == KSYM_Escape)
   {
+    StopTextInput();
+
     setTypeNameValues(name, pos, FALSE);
 
     active = FALSE;
@@ -4275,8 +4279,6 @@ static void HandleTypeNameExt(boolean initialize, Key key)
 
   if (!active)
   {
-    StopTextInput();
-
     SetGameStatus(game_status_last_screen);
 
     if (game_status == GAME_MODE_MAIN)