Index: lcl/include/finddialog.inc
===================================================================
--- lcl/include/finddialog.inc	(revision 57570)
+++ lcl/include/finddialog.inc	(working copy)
@@ -81,7 +81,6 @@
   BorderIcons := [biSystemMenu, biHelp];
   Caption := 'Find';
   //OnCreate := @FormCreate;
-  Position := poMainFormCenter;
 
   LCLVersion := '1.3';
 
@@ -520,9 +519,6 @@
     HelpButton.OnClick := @HelpClick;
     CancelButton.OnClick := @CancelClick;
     PopupMode := pmAuto;
-    // Init local property with defaut value
-    FFormTop  := top;
-    FFormLeft := Left;
   end;
 end;
 
@@ -576,13 +572,13 @@
 end;
 
 procedure TFindDialog.CalcPosition(aForm:Tform);
-Var
-  MfBound : Trect;
-
 begin
-  MfBound := Application.MainForm.BoundsRect;
-  FFormTop  := MfBound.Top + (((MfBound.Bottom - MfBound.Top)  - aForm.Height) Div 2);
-  FFormLeft := MfBound.Left + (((MfBound.Right - MfBound.Left) - aForm.Width) Div 2);
+  if (FFormLeft = 0) and (FFormTop = 0) then // Self.Position not set
+  begin
+    aForm.Position := poMainFormCenter;
+    FFormTop := aForm.Top;
+    FFormLeft := aForm.Left;
+  end;
   aForm.Top := FFormTop;
   aForm.Left := FFormLeft;
 end;
Index: lcl/include/replacedialog.inc
===================================================================
--- lcl/include/replacedialog.inc	(revision 57570)
+++ lcl/include/replacedialog.inc	(working copy)
@@ -73,7 +73,6 @@
   AutoSize := True;
   BorderIcons := [biSystemMenu, biHelp];
   Caption := 'Replace Text';
-  Position := poMainFormCenter;
   LCLVersion := '1.3';
 
   TextLabel := TLabel.Create(Self);