diff --git a/Terminal.Gui/Views/DateField.cs b/Terminal.Gui/Views/DateField.cs
index 08d21d732..9490a7b28 100644
--- a/Terminal.Gui/Views/DateField.cs
+++ b/Terminal.Gui/Views/DateField.cs
@@ -116,6 +116,11 @@ public class DateField : TextField
     /// <inheritdoc/>
     protected override bool OnMouseEvent  (MouseEventArgs ev)
     {
+        if (base.OnMouseEvent (ev) || ev.Handled)
+        {
+            return true;
+        }
+
         if (SelectedLength == 0 && ev.Flags.HasFlag (MouseFlags.Button1Pressed))
         {
             AdjCursorPosition (ev.Position.X);
@@ -162,7 +167,7 @@ public class DateField : TextField
             newPoint = 1;
         }
 
-        //if (newPoint != point)
+        if (newPoint != point)
         {
             CursorPosition = newPoint;
         }
diff --git a/Terminal.Gui/Views/TimeField.cs b/Terminal.Gui/Views/TimeField.cs
index 32f5046fc..ecc94a7be 100644
--- a/Terminal.Gui/Views/TimeField.cs
+++ b/Terminal.Gui/Views/TimeField.cs
@@ -165,6 +165,11 @@ public class TimeField : TextField
     /// <inheritdoc/>
     protected override bool OnMouseEvent  (MouseEventArgs ev)
     {
+        if (base.OnMouseEvent (ev) || ev.Handled)
+        {
+            return true;
+        }
+
         if (SelectedLength == 0 && ev.Flags.HasFlag (MouseFlags.Button1Pressed))
         {
             int point = ev.Position.X;
@@ -220,7 +225,7 @@ public class TimeField : TextField
             newPoint = 1;
         }
 
-        //if (newPoint != point)
+        if (newPoint != point)
         {
             CursorPosition = newPoint;
         }