diff --git a/lcl/include/dbedit.inc b/lcl/include/dbedit.inc
index 99f020e5c3..c702d49ef8 100644
--- a/lcl/include/dbedit.inc
+++ b/lcl/include/dbedit.inc
@@ -202,9 +202,14 @@ begin
     exit;
   FFocusedDisplay := true;
   if WidgetSet.GetLCLCapability(lcReceivesLMClearCutCopyPasteReliably) = LCL_CAPABILITY_YES then
+  begin
     FDataLink.Reset
-  else
+  end
+  else begin
+    RestoreMask(Self.Text);
     FDataLink.Edit;
+    Self.DoEnter;
+  end;
 end;
 
 procedure TDBEdit.WMKillFocus(var Message: TLMKillFocus);