diff --git a/cg/cg2102.cpp b/cg/cg2102.cpp
index acb168a4c..27d5d327c 100755
--- a/cg/cg2102.cpp
+++ b/cg/cg2102.cpp
@@ -1679,7 +1679,8 @@ bool TPrimanota_application::datareg_handler(TMask_field& f, KEY key)
   bool ok = TRUE;
   TMask& m = f.mask();  
   
-  if ((key == K_TAB && m.is_running()) || key == K_ENTER)
+  //if ((key == K_TAB && m.is_running() ) || key == K_ENTER)
+  if (key == K_TAB && f.focusdirty() || key == K_ENTER)
   {            
     const TDate dr(f.get());                         // Data dell'operazione
     if (dr > TDate(TODAY))