diff --git a/include/maskfld.cpp b/include/maskfld.cpp
index 38e542519..dfac354bf 100755
--- a/include/maskfld.cpp
+++ b/include/maskfld.cpp
@@ -2656,7 +2656,12 @@ bool TButton_field::on_key(KEY key)
   {
     on_hit();
     return TRUE;
-  }  
+  }     
+  else
+  {
+    if (key == K_ENTER)
+      xvt_kill_focus(win());
+  }
   return TMask_field::on_key(key);
 }