diff --git a/include/validate.cpp b/include/validate.cpp
index 6e6b54368..6f30e5059 100755
--- a/include/validate.cpp
+++ b/include/validate.cpp
@@ -465,19 +465,19 @@ HIDDEN bool _autoexit_val(TEdit_field& f, KEY key)
     if (empty)
     { 
       if (c.check_type() != CHECK_NONE || one_not_empty)
-        return key == K_TAB;
+        return TRUE;
     } 
     else 
       one_not_empty = TRUE;
   }
   
-  bool ok = TRUE;
   if (key == K_TAB)
-    f.mask().send_key(K_AUTO_ENTER, 0);
-  else
-    ok = one_not_empty;
+  {
+    if (one_not_empty)
+      f.mask().stop_run(K_AUTO_ENTER);
+  }
 
-  return ok;
+  return TRUE;
 }