diff --git a/applications/lazedit/main.lfm b/applications/lazedit/main.lfm
index d8ad05b8a..a0be27146 100644
--- a/applications/lazedit/main.lfm
+++ b/applications/lazedit/main.lfm
@@ -14,7 +14,7 @@ object LazEditMainForm: TLazEditMainForm
   OnDestroy = FormDestroy
   OnDropFiles = FormDropFiles
   OnShow = FormShow
-  LCLVersion = '1.1'
+  LCLVersion = '1.3'
   object StatusBar: TStatusBar
     Left = 0
     Height = 23
@@ -1823,12 +1823,14 @@ object LazEditMainForm: TLazEditMainForm
     end
   end
   object FindDialog: TFindDialog
+    OnClose = FindReplaceDialogClose
     Options = [frDown, frHideEntireScope]
     OnFind = DoFind
     left = 280
     top = 336
   end
   object ReplaceDialog: TReplaceDialog
+    OnClose = FindReplaceDialogClose
     Options = [frDown, frReplace, frReplaceAll, frHideEntireScope]
     OnFind = DoFind
     OnReplace = DoReplace
diff --git a/applications/lazedit/main.pp b/applications/lazedit/main.pp
index eacf316f6..391ed4e8d 100644
--- a/applications/lazedit/main.pp
+++ b/applications/lazedit/main.pp
@@ -354,6 +354,7 @@ type
     procedure acLayoutSubExecute(Sender: TObject);
     procedure acLayoutSupExecute(Sender: TObject);
     procedure acLayoutUnderlineExecute(Sender: TObject);
+    procedure FindReplaceDialogClose(Sender: TObject);
 
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
@@ -1068,6 +1069,11 @@ begin
   TryMarkSelection(underline_start, underline_end);
 end;
 
+procedure TLazEditMainForm.FindReplaceDialogClose(Sender: TObject);
+begin
+  Self.BringToFront;
+end;
+
 procedure TLazEditMainForm.acEditCopyExecute(Sender: TObject);
 begin
   EditCopy;