diff --git a/include/maskfld.cpp b/include/maskfld.cpp
index adfac06c9..25940b49e 100755
--- a/include/maskfld.cpp
+++ b/include/maskfld.cpp
@@ -2379,12 +2379,21 @@ bool TEdit_field::on_key(KEY key)
       if (k != K_F9) set_focus();
       enable_check(TRUE);
       if (k == K_ENTER)
-      {
+      {     
+/*      
         set_dirty();
         if (mask().is_running())   
           send_key(K_TAB, 0);
         else
           on_hit();
+*/      
+        set_dirty();
+        on_hit();
+        if (mask().is_running())   
+        {
+          set_focusdirty(FALSE);
+          send_key(K_TAB, 0);
+        }
         return TRUE;
       } 
       else