diff --git a/lcl/maskedit.pp b/lcl/maskedit.pp
index 5a7270a78e..3d675252f9 100644
--- a/lcl/maskedit.pp
+++ b/lcl/maskedit.pp
@@ -1820,6 +1820,8 @@ begin
   if IsMasked and (not ReadOnly) then
   begin
     RealSetTextWhileMasked(FTextOnEnter);
+    FCursorPos := FFirstFreePos-1;
+    SetCursorPos;
   end;
 end;