diff --git a/comp/src/gb.form/.src/Date/FCalendar.class b/comp/src/gb.form/.src/Date/FCalendar.class
index 0a0b07050..3d8f98301 100644
--- a/comp/src/gb.form/.src/Date/FCalendar.class
+++ b/comp/src/gb.form/.src/Date/FCalendar.class
@@ -648,6 +648,7 @@ Public Sub dwgTime_MouseDown()
   If $iCurrentTime >= 0 Then
     SetTime(Time($iCurrentTime \ 2, 30 * ($iCurrentTime Mod 2), 0))
   Endif
+  GetParent()._Click
 
 End
 
@@ -878,13 +879,15 @@ End
 
 Public Sub txtMinute_Activate()
 
-  dwgTime_DblClick
+  txtMinute_LostFocus
+  btnOK_Click
   
 End
 
 Public Sub btnOK_Click()
 
-  dwgTime_DblClick
+  GetParent()._Click()
+  'GetParent()._Activate()
 
 End