diff --git a/ide/debugmanager.pas b/ide/debugmanager.pas
index 000e797692..5952897545 100644
--- a/ide/debugmanager.pas
+++ b/ide/debugmanager.pas
@@ -1822,7 +1822,7 @@ end;
 
 function TDebugManager.RunDebugger: TModalResult;
 begin
-  //writeln('TDebugManager.RunDebugger A ',FDebugger<>nil,' Destroying=',Destroying);
+  writeln('TDebugManager.RunDebugger A ',FDebugger<>nil,' Destroying=',Destroying);
   Result:=mrCancel;
   if Destroying then exit;
   if (FDebugger <> nil) then begin
diff --git a/ide/findreplacedialog.lfm b/ide/findreplacedialog.lfm
index 5757b863b7..722c3574ed 100644
--- a/ide/findreplacedialog.lfm
+++ b/ide/findreplacedialog.lfm
@@ -1,46 +1,56 @@
 object LazFindReplaceDialog: TLazFindReplaceDialog
+  Left = 334
+  Height = 331
+  Top = 185
+  Width = 416
+  HorzScrollBar.Page = 415
+  VertScrollBar.Page = 330
   ActiveControl = TextToFindComboBox
   BorderIcons = [biSystemMenu]
   Caption = 'LazFindReplaceDialog'
-  ClientHeight = 331
-  ClientWidth = 416
   Constraints.MinHeight = 312
+  KeyPreview = True
   OnResize = FormResize
-  PixelsPerInch = 96
   Position = poScreenCenter
-  HorzScrollBar.Page = 415
-  VertScrollBar.Page = 330
-  Left = 311
-  Height = 331
-  Top = 426
-  Width = 416
   object TextToFindLabel: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = TextToFindComboBox
+    AnchorSideTop.Side = asrCenter
+    Left = 6
+    Height = 13
+    Top = 16
+    Width = 94
     Alignment = taRightJustify
-    BorderSpacing.Around = 6
+    BorderSpacing.Left = 6
     Caption = 'TextToFindLabel'
     Color = clNone
     FocusControl = TextToFindComboBox
     ParentColor = False
-    AnchorSideLeft.Control = Owner
-    Left = 6
-    Height = 14
-    Top = 16
-    Width = 80
   end
   object ReplaceWithLabel: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = ReplaceTextComboBox
+    AnchorSideTop.Side = asrCenter
+    Left = 6
+    Height = 13
+    Top = 43
+    Width = 102
     Alignment = taRightJustify
-    BorderSpacing.Around = 6
+    BorderSpacing.Left = 6
     Caption = 'ReplaceWithLabel'
     Color = clNone
     FocusControl = ReplaceTextComboBox
     ParentColor = False
-    AnchorSideLeft.Control = Owner
-    Left = 6
-    Height = 14
-    Top = 40
-    Width = 86
   end
   object TextToFindComboBox: TComboBox
+    AnchorSideLeft.Control = TextToFindLabel
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 112
+    Height = 21
+    Top = 12
+    Width = 298
     Anchors = [akTop, akLeft, akRight]
     AutoComplete = True
     AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending]
@@ -50,16 +60,16 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
     OnKeyDown = TextToFindComboboxKeyDown
     TabOrder = 0
     Text = 'TextToFindComboBox'
-    AnchorSideLeft.Control = TextToFindLabel
+  end
+  object ReplaceTextComboBox: TComboBox
+    AnchorSideLeft.Control = ReplaceWithLabel
     AnchorSideLeft.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 98
+    Left = 120
     Height = 21
-    Top = 12
-    Width = 312
-  end
-  object ReplaceTextComboBox: TComboBox
+    Top = 39
+    Width = 290
     Anchors = [akTop, akLeft, akRight]
     AutoComplete = True
     AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending]
@@ -69,16 +79,15 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
     OnKeyDown = TextToFindComboboxKeyDown
     TabOrder = 1
     Text = 'ReplaceTextComboBox'
-    AnchorSideLeft.Control = ReplaceWithLabel
-    AnchorSideLeft.Side = asrBottom
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    Left = 104
-    Height = 21
-    Top = 39
-    Width = 306
   end
   object CancelButton: TBitBtn
+    AnchorSideRight.Control = ReplaceAllButton
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 222
+    Height = 24
+    Top = 301
+    Width = 73
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
@@ -91,15 +100,16 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
     NumGlyphs = 0
     OnClick = CancelButtonClick
     TabOrder = 2
-    AnchorSideRight.Control = ReplaceAllButton
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 194
-    Height = 33
-    Top = 292
-    Width = 80
   end
   object OKButton: TBitBtn
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 359
+    Height = 24
+    Top = 301
+    Width = 51
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
@@ -112,33 +122,28 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
     NumGlyphs = 0
     OnClick = OkButtonClick
     TabOrder = 3
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 348
-    Height = 33
-    Top = 292
-    Width = 62
   end
   object OptionsGroupBox: TGroupBox
-    Anchors = [akTop, akLeft, akBottom]
-    BorderSpacing.Left = 6
-    BorderSpacing.Top = 6
-    BorderSpacing.Bottom = 6
-    Caption = 'OptionsGroupBox'
-    ClientHeight = 202
-    ClientWidth = 195
-    TabOrder = 4
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = ReplaceTextComboBox
     AnchorSideTop.Side = asrBottom
     AnchorSideBottom.Control = CancelButton
     Left = 6
-    Height = 220
+    Height = 229
     Top = 66
     Width = 199
+    Anchors = [akTop, akLeft, akBottom]
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    BorderSpacing.Bottom = 6
+    Caption = 'OptionsGroupBox'
+    TabOrder = 4
     object PromptOnReplaceCheckBox: TCheckBox
+      AnchorSideTop.Side = asrBottom
+      Left = 6
+      Height = 20
+      Top = 140
+      Width = 183
       Align = alTop
       BorderSpacing.Top = 6
       BorderSpacing.Around = 6
@@ -148,13 +153,13 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
       ShowHint = True
       State = cbChecked
       TabOrder = 0
-      AnchorSideTop.Side = asrBottom
-      Left = 6
-      Height = 13
-      Top = 112
-      Width = 183
     end
     object MultiLineCheckBox: TCheckBox
+      AnchorSideTop.Side = asrBottom
+      Left = 6
+      Height = 20
+      Top = 108
+      Width = 183
       Align = alTop
       BorderSpacing.Top = 6
       BorderSpacing.Around = 6
@@ -163,13 +168,13 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
       ParentShowHint = False
       ShowHint = True
       TabOrder = 1
-      AnchorSideTop.Side = asrBottom
-      Left = 6
-      Height = 13
-      Top = 87
-      Width = 183
     end
     object RegularExpressionsCheckBox: TCheckBox
+      AnchorSideTop.Side = asrBottom
+      Left = 6
+      Height = 20
+      Top = 76
+      Width = 183
       Align = alTop
       BorderSpacing.Top = 6
       BorderSpacing.Around = 6
@@ -177,13 +182,13 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
       ParentShowHint = False
       ShowHint = True
       TabOrder = 2
-      AnchorSideTop.Side = asrBottom
-      Left = 6
-      Height = 13
-      Top = 62
-      Width = 183
     end
     object WholeWordsOnlyCheckBox: TCheckBox
+      AnchorSideTop.Side = asrBottom
+      Left = 6
+      Height = 20
+      Top = 44
+      Width = 183
       Align = alTop
       BorderSpacing.Top = 6
       BorderSpacing.Around = 6
@@ -191,13 +196,13 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
       ParentShowHint = False
       ShowHint = True
       TabOrder = 3
-      AnchorSideTop.Side = asrBottom
-      Left = 6
-      Height = 13
-      Top = 37
-      Width = 183
     end
     object CaseSensitiveCheckBox: TCheckBox
+      AnchorSideTop.Side = asrBottom
+      Left = 6
+      Height = 20
+      Top = 12
+      Width = 183
       Align = alTop
       BorderSpacing.Top = 6
       BorderSpacing.Around = 6
@@ -205,19 +210,9 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
       ParentShowHint = False
       ShowHint = True
       TabOrder = 4
-      AnchorSideTop.Side = asrBottom
-      Left = 6
-      Height = 13
-      Top = 12
-      Width = 183
     end
   end
   object ScopeGroupBox: TGroupBox
-    BorderSpacing.Around = 6
-    Caption = 'ScopeGroupBox'
-    ClientHeight = 51
-    ClientWidth = 195
-    TabOrder = 5
     AnchorSideLeft.Control = OptionsGroupBox
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = OriginGroupBox
@@ -226,34 +221,34 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
     Height = 69
     Top = 141
     Width = 199
+    BorderSpacing.Around = 6
+    Caption = 'ScopeGroupBox'
+    TabOrder = 5
     object SelectedRadioButton: TRadioButton
+      Left = 3
+      Height = 20
+      Top = 32
+      Width = 189
       Align = alTop
       BorderSpacing.Top = 6
-      BorderSpacing.Around = 6
+      BorderSpacing.Around = 3
       Caption = 'SelectedRadioButton'
       TabOrder = 0
-      Left = 6
-      Height = 13
-      Top = 31
-      Width = 183
     end
     object GlobalRadioButton: TRadioButton
+      Left = 3
+      Height = 20
+      Top = 3
+      Width = 189
       Align = alTop
-      BorderSpacing.Around = 6
+      BorderSpacing.Around = 3
       Caption = 'GlobalRadioButton'
+      Checked = True
+      State = cbChecked
       TabOrder = 1
-      Left = 6
-      Height = 13
-      Top = 6
-      Width = 183
     end
   end
   object DirectionGroupBox: TGroupBox
-    BorderSpacing.Around = 6
-    Caption = 'DirectionGroupBox'
-    ClientHeight = 51
-    ClientWidth = 195
-    TabOrder = 6
     AnchorSideLeft.Control = OptionsGroupBox
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = ScopeGroupBox
@@ -262,34 +257,34 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
     Height = 69
     Top = 216
     Width = 199
+    BorderSpacing.Around = 6
+    Caption = 'DirectionGroupBox'
+    TabOrder = 6
     object BackwardRadioButton: TRadioButton
+      Left = 3
+      Height = 20
+      Top = 32
+      Width = 189
       Align = alTop
       BorderSpacing.Top = 6
-      BorderSpacing.Around = 6
+      BorderSpacing.Around = 3
       Caption = 'BackwardRadioButton'
       TabOrder = 0
-      Left = 6
-      Height = 13
-      Top = 31
-      Width = 183
     end
     object ForwardRadioButton: TRadioButton
+      Left = 3
+      Height = 20
+      Top = 3
+      Width = 189
       Align = alTop
-      BorderSpacing.Around = 6
+      BorderSpacing.Around = 3
       Caption = 'ForwardRadioButton'
+      Checked = True
+      State = cbChecked
       TabOrder = 1
-      Left = 6
-      Height = 13
-      Top = 6
-      Width = 183
     end
   end
   object OriginGroupBox: TGroupBox
-    BorderSpacing.Around = 6
-    Caption = 'OriginGroupBox'
-    ClientHeight = 51
-    ClientWidth = 195
-    TabOrder = 7
     AnchorSideLeft.Control = OptionsGroupBox
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = ReplaceTextComboBox
@@ -298,28 +293,40 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
     Height = 69
     Top = 66
     Width = 199
+    BorderSpacing.Around = 6
+    Caption = 'OriginGroupBox'
+    TabOrder = 7
     object FromCursorRadioButton: TRadioButton
+      Left = 3
+      Height = 20
+      Top = 3
+      Width = 189
       Align = alTop
-      BorderSpacing.Around = 6
+      BorderSpacing.Around = 3
       Caption = 'FromCursorRadioButton'
+      Checked = True
+      State = cbChecked
       TabOrder = 0
-      Left = 6
-      Height = 13
-      Top = 6
-      Width = 183
     end
     object EntireScopeRadioButton: TRadioButton
+      Left = 3
+      Height = 20
+      Top = 26
+      Width = 189
       Align = alTop
-      BorderSpacing.Around = 6
+      BorderSpacing.Around = 3
       Caption = 'EntireScopeRadioButton'
       TabOrder = 1
-      Left = 6
-      Height = 13
-      Top = 25
-      Width = 183
     end
   end
   object ReplaceAllButton: TBitBtn
+    AnchorSideRight.Control = OKButton
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 301
+    Height = 28
+    Top = 297
+    Width = 52
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
@@ -329,12 +336,5 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
     ModalResult = 8
     NumGlyphs = 0
     TabOrder = 8
-    AnchorSideRight.Control = OKButton
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 280
-    Height = 33
-    Top = 292
-    Width = 62
   end
 end
diff --git a/ide/findreplacedialog.lrs b/ide/findreplacedialog.lrs
index 2a0d294f26..484d258001 100644
--- a/ide/findreplacedialog.lrs
+++ b/ide/findreplacedialog.lrs
@@ -1,115 +1,115 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TLazFindReplaceDialog','FORMDATA',[
-  'TPF0'#21'TLazFindReplaceDialog'#20'LazFindReplaceDialog'#13'ActiveControl'#7
-  +#18'TextToFindComboBox'#11'BorderIcons'#11#12'biSystemMenu'#0#7'Caption'#6#20
-  +'LazFindReplaceDialog'#12'ClientHeight'#3'K'#1#11'ClientWidth'#3#160#1#21'Co'
-  +'nstraints.MinHeight'#3'8'#1#8'OnResize'#7#10'FormResize'#13'PixelsPerInch'#2
-  +'`'#8'Position'#7#14'poScreenCenter'#18'HorzScrollBar.Page'#3#159#1#18'VertS'
-  +'crollBar.Page'#3'J'#1#4'Left'#3'7'#1#6'Height'#3'K'#1#3'Top'#3#170#1#5'Widt'
-  +'h'#3#160#1#0#6'TLabel'#15'TextToFindLabel'#9'Alignment'#7#14'taRightJustify'
-  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'TextToFindLabel'#5'Color'#7#6
-  +'clNone'#12'FocusControl'#7#18'TextToFindComboBox'#11'ParentColor'#8#22'Anch'
-  +'orSideLeft.Control'#7#5'Owner'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#16#5'Wid'
-  +'th'#2'P'#0#0#6'TLabel'#16'ReplaceWithLabel'#9'Alignment'#7#14'taRightJustif'
-  +'y'#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'ReplaceWithLabel'#5'Color'#7
-  +#6'clNone'#12'FocusControl'#7#19'ReplaceTextComboBox'#11'ParentColor'#8#22'A'
-  +'nchorSideLeft.Control'#7#5'Owner'#4'Left'#2#6#6'Height'#2#14#3'Top'#2'('#5
-  +'Width'#2'V'#0#0#9'TComboBox'#18'TextToFindComboBox'#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#12'AutoComplete'#9#16'AutoCompleteText'#11#12'cbactEna'
-  +'bled'#22'cbactEndOfLineComplete'#21'cbactRetainPrefixCase'#20'cbactSearchAs'
-  +'cending'#0#18'BorderSpacing.Left'#2#6#20'BorderSpacing.Around'#2#6#9'MaxLen'
-  +'gth'#2#0#9'OnKeyDown'#7#25'TextToFindComboboxKeyDown'#8'TabOrder'#2#0#4'Tex'
-  +'t'#6#18'TextToFindComboBox'#22'AnchorSideLeft.Control'#7#15'TextToFindLabel'
-  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owne'
-  +'r'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'b'#6'Height'#2#21#3'To'
-  +'p'#2#12#5'Width'#3'8'#1#0#0#9'TComboBox'#19'ReplaceTextComboBox'#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#7'akRight'#0#12'AutoComplete'#9#16'AutoCompleteText'
-  +#11#12'cbactEnabled'#22'cbactEndOfLineComplete'#21'cbactRetainPrefixCase'#20
-  +'cbactSearchAscending'#0#18'BorderSpacing.Left'#2#6#20'BorderSpacing.Around'
-  +#2#6#9'MaxLength'#2#0#9'OnKeyDown'#7#25'TextToFindComboboxKeyDown'#8'TabOrde'
-  +'r'#2#1#4'Text'#6#19'ReplaceTextComboBox'#22'AnchorSideLeft.Control'#7#16'Re'
-  +'placeWithLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#23'AnchorSideRight.C'
-  +'ontrol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'h'#6'H'
-  +'eight'#2#21#3'Top'#2''''#5'Width'#3'2'#1#0#0#7'TBitBtn'#12'CancelButton'#7
-  +'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'
-  +#2#6#25'BorderSpacing.InnerBorder'#2#2#6'Cancel'#9#7'Caption'#6#6'Cancel'#21
-  +'Constraints.MaxHeight'#2'!'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'Num'
-  +'Glyphs'#2#0#7'OnClick'#7#17'CancelButtonClick'#8'TabOrder'#2#2#23'AnchorSid'
-  +'eRight.Control'#7#16'ReplaceAllButton'#24'AnchorSideBottom.Control'#7#5'Own'
-  +'er'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#194#0#6'Height'#2'!'
-  +#3'Top'#3'$'#1#5'Width'#2'P'#0#0#7'TBitBtn'#8'OKButton'#7'Anchors'#11#7'akRi'
-  +'ght'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSpac'
-  +'ing.InnerBorder'#2#2#7'Caption'#6#3'&OK'#21'Constraints.MaxHeight'#2'!'#7'D'
-  +'efault'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'
-  +#7#13'OkButtonClick'#8'TabOrder'#2#3#23'AnchorSideRight.Control'#7#5'Owner'
-  +#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Ow'
-  +'ner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'\'#1#6'Height'#2'!'
-  +#3'Top'#3'$'#1#5'Width'#2'>'#0#0#9'TGroupBox'#15'OptionsGroupBox'#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#8'akBottom'#0#18'BorderSpacing.Left'#2#6#17'BorderSpa'
-  +'cing.Top'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#15'OptionsGroupBox'
-  +#12'ClientHeight'#3#202#0#11'ClientWidth'#3#195#0#8'TabOrder'#2#4#22'AnchorS'
-  +'ideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#19'ReplaceTextCombo'
-  +'Box'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12
-  +'CancelButton'#4'Left'#2#6#6'Height'#3#220#0#3'Top'#2'B'#5'Width'#3#199#0#0#9
-  +'TCheckBox'#23'PromptOnReplaceCheckBox'#5'Align'#7#5'alTop'#17'BorderSpacing'
-  +'.Top'#2#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'PromptOnReplaceCheck'
-  +'Box'#7'Checked'#9#14'ParentShowHint'#8#8'ShowHint'#9#5'State'#7#9'cbChecked'
-  +#8'TabOrder'#2#0#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'
-  +#2#13#3'Top'#2'p'#5'Width'#3#183#0#0#0#9'TCheckBox'#17'MultiLineCheckBox'#5
-  +'Align'#7#5'alTop'#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#17'MultiLineCheckBox'#7'Enabled'#8#14'ParentShowHint'#8#8'ShowHi'
-  +'nt'#9#8'TabOrder'#2#1#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'H'
-  +'eight'#2#13#3'Top'#2'W'#5'Width'#3#183#0#0#0#9'TCheckBox'#26'RegularExpress'
-  +'ionsCheckBox'#5'Align'#7#5'alTop'#17'BorderSpacing.Top'#2#6#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6#26'RegularExpressionsCheckBox'#14'ParentShowHint'
-  +#8#8'ShowHint'#9#8'TabOrder'#2#2#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Lef'
-  +'t'#2#6#6'Height'#2#13#3'Top'#2'>'#5'Width'#3#183#0#0#0#9'TCheckBox'#22'Whol'
-  ,'eWordsOnlyCheckBox'#5'Align'#7#5'alTop'#17'BorderSpacing.Top'#2#6#20'Border'
-  +'Spacing.Around'#2#6#7'Caption'#6#22'WholeWordsOnlyCheckBox'#14'ParentShowHi'
-  +'nt'#8#8'ShowHint'#9#8'TabOrder'#2#3#18'AnchorSideTop.Side'#7#9'asrBottom'#4
-  +'Left'#2#6#6'Height'#2#13#3'Top'#2'%'#5'Width'#3#183#0#0#0#9'TCheckBox'#21'C'
-  +'aseSensitiveCheckBox'#5'Align'#7#5'alTop'#17'BorderSpacing.Top'#2#6#20'Bord'
-  +'erSpacing.Around'#2#6#7'Caption'#6#21'CaseSensitiveCheckBox'#14'ParentShowH'
-  +'int'#8#8'ShowHint'#9#8'TabOrder'#2#4#18'AnchorSideTop.Side'#7#9'asrBottom'#4
-  +'Left'#2#6#6'Height'#2#13#3'Top'#2#12#5'Width'#3#183#0#0#0#0#9'TGroupBox'#13
-  +'ScopeGroupBox'#20'BorderSpacing.Around'#2#6#7'Caption'#6#13'ScopeGroupBox'
-  +#12'ClientHeight'#2'3'#11'ClientWidth'#3#195#0#8'TabOrder'#2#5#22'AnchorSide'
-  +'Left.Control'#7#15'OptionsGroupBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'
-  +#21'AnchorSideTop.Control'#7#14'OriginGroupBox'#18'AnchorSideTop.Side'#7#9'a'
-  +'srBottom'#4'Left'#3#211#0#6'Height'#2'E'#3'Top'#3#141#0#5'Width'#3#199#0#0
-  +#12'TRadioButton'#19'SelectedRadioButton'#5'Align'#7#5'alTop'#17'BorderSpaci'
-  +'ng.Top'#2#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'SelectedRadioButto'
-  +'n'#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2#13#3'Top'#2#31#5'Width'#3#183#0#0
-  +#0#12'TRadioButton'#17'GlobalRadioButton'#5'Align'#7#5'alTop'#20'BorderSpaci'
-  +'ng.Around'#2#6#7'Caption'#6#17'GlobalRadioButton'#8'TabOrder'#2#1#4'Left'#2
-  +#6#6'Height'#2#13#3'Top'#2#6#5'Width'#3#183#0#0#0#0#9'TGroupBox'#17'Directio'
-  +'nGroupBox'#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'DirectionGroupBox'
-  +#12'ClientHeight'#2'3'#11'ClientWidth'#3#195#0#8'TabOrder'#2#6#22'AnchorSide'
-  +'Left.Control'#7#15'OptionsGroupBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'
-  +#21'AnchorSideTop.Control'#7#13'ScopeGroupBox'#18'AnchorSideTop.Side'#7#9'as'
-  +'rBottom'#4'Left'#3#211#0#6'Height'#2'E'#3'Top'#3#216#0#5'Width'#3#199#0#0#12
-  +'TRadioButton'#19'BackwardRadioButton'#5'Align'#7#5'alTop'#17'BorderSpacing.'
-  +'Top'#2#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'BackwardRadioButton'#8
-  +'TabOrder'#2#0#4'Left'#2#6#6'Height'#2#13#3'Top'#2#31#5'Width'#3#183#0#0#0#12
-  +'TRadioButton'#18'ForwardRadioButton'#5'Align'#7#5'alTop'#20'BorderSpacing.A'
-  +'round'#2#6#7'Caption'#6#18'ForwardRadioButton'#8'TabOrder'#2#1#4'Left'#2#6#6
-  +'Height'#2#13#3'Top'#2#6#5'Width'#3#183#0#0#0#0#9'TGroupBox'#14'OriginGroupB'
-  +'ox'#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'OriginGroupBox'#12'ClientH'
-  +'eight'#2'3'#11'ClientWidth'#3#195#0#8'TabOrder'#2#7#22'AnchorSideLeft.Contr'
-  +'ol'#7#15'OptionsGroupBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorS'
-  +'ideTop.Control'#7#19'ReplaceTextComboBox'#18'AnchorSideTop.Side'#7#9'asrBot'
-  +'tom'#4'Left'#3#211#0#6'Height'#2'E'#3'Top'#2'B'#5'Width'#3#199#0#0#12'TRadi'
-  +'oButton'#21'FromCursorRadioButton'#5'Align'#7#5'alTop'#20'BorderSpacing.Aro'
-  +'und'#2#6#7'Caption'#6#21'FromCursorRadioButton'#8'TabOrder'#2#0#4'Left'#2#6
-  +#6'Height'#2#13#3'Top'#2#6#5'Width'#3#183#0#0#0#12'TRadioButton'#22'EntireSc'
-  +'opeRadioButton'#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'
-  +#6#22'EntireScopeRadioButton'#8'TabOrder'#2#1#4'Left'#2#6#6'Height'#2#13#3'T'
-  +'op'#2#25#5'Width'#3#183#0#0#0#0#7'TBitBtn'#16'ReplaceAllButton'#7'Anchors'
-  +#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Ca'
-  +'ption'#6#4'&All'#21'Constraints.MaxHeight'#2'!'#4'Kind'#7#5'bkAll'#11'Modal'
-  +'Result'#2#8#9'NumGlyphs'#2#0#8'TabOrder'#2#8#23'AnchorSideRight.Control'#7#8
-  +'OKButton'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'
-  +#7#9'asrBottom'#4'Left'#3#24#1#6'Height'#2'!'#3'Top'#3'$'#1#5'Width'#2'>'#0#0
-  +#0
+  'TPF0'#21'TLazFindReplaceDialog'#20'LazFindReplaceDialog'#4'Left'#3'N'#1#6'He'
+  +'ight'#3'K'#1#3'Top'#3#185#0#5'Width'#3#160#1#18'HorzScrollBar.Page'#3#159#1
+  +#18'VertScrollBar.Page'#3'J'#1#13'ActiveControl'#7#18'TextToFindComboBox'#11
+  +'BorderIcons'#11#12'biSystemMenu'#0#7'Caption'#6#20'LazFindReplaceDialog'#21
+  +'Constraints.MinHeight'#3'8'#1#10'KeyPreview'#9#8'OnResize'#7#10'FormResize'
+  +#8'Position'#7#14'poScreenCenter'#0#6'TLabel'#15'TextToFindLabel'#22'AnchorS'
+  +'ideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#18'TextToFindComboB'
+  +'ox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#13#3'Top'
+  +#2#16#5'Width'#2'^'#9'Alignment'#7#14'taRightJustify'#18'BorderSpacing.Left'
+  +#2#6#7'Caption'#6#15'TextToFindLabel'#5'Color'#7#6'clNone'#12'FocusControl'#7
+  +#18'TextToFindComboBox'#11'ParentColor'#8#0#0#6'TLabel'#16'ReplaceWithLabel'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#19'Replac'
+  +'eTextComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2
+  +#13#3'Top'#2'+'#5'Width'#2'f'#9'Alignment'#7#14'taRightJustify'#18'BorderSpa'
+  +'cing.Left'#2#6#7'Caption'#6#16'ReplaceWithLabel'#5'Color'#7#6'clNone'#12'Fo'
+  +'cusControl'#7#19'ReplaceTextComboBox'#11'ParentColor'#8#0#0#9'TComboBox'#18
+  +'TextToFindComboBox'#22'AnchorSideLeft.Control'#7#15'TextToFindLabel'#19'Anc'
+  +'horSideLeft.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'p'#6'Height'#2#21#3'Top'#2#12
+  +#5'Width'#3'*'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#12'AutoComple'
+  +'te'#9#16'AutoCompleteText'#11#12'cbactEnabled'#22'cbactEndOfLineComplete'#21
+  +'cbactRetainPrefixCase'#20'cbactSearchAscending'#0#18'BorderSpacing.Left'#2#6
+  +#20'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#9'OnKeyDown'#7#25'TextToFindC'
+  +'omboboxKeyDown'#8'TabOrder'#2#0#4'Text'#6#18'TextToFindComboBox'#0#0#9'TCom'
+  +'boBox'#19'ReplaceTextComboBox'#22'AnchorSideLeft.Control'#7#16'ReplaceWithL'
+  +'abel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5
+  +'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'x'#6'Height'#2#21#3
+  +'Top'#2''''#5'Width'#3'"'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#12
+  +'AutoComplete'#9#16'AutoCompleteText'#11#12'cbactEnabled'#22'cbactEndOfLineC'
+  +'omplete'#21'cbactRetainPrefixCase'#20'cbactSearchAscending'#0#18'BorderSpac'
+  +'ing.Left'#2#6#20'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#9'OnKeyDown'#7
+  +#25'TextToFindComboboxKeyDown'#8'TabOrder'#2#1#4'Text'#6#19'ReplaceTextCombo'
+  +'Box'#0#0#7'TBitBtn'#12'CancelButton'#23'AnchorSideRight.Control'#7#16'Repla'
+  +'ceAllButton'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Si'
+  +'de'#7#9'asrBottom'#4'Left'#3#222#0#6'Height'#2#24#3'Top'#3'-'#1#5'Width'#2
+  +'I'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Ar'
+  +'ound'#2#6#25'BorderSpacing.InnerBorder'#2#2#6'Cancel'#9#7'Caption'#6#6'Canc'
+  +'el'#21'Constraints.MaxHeight'#2'!'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2
+  +#9'NumGlyphs'#2#0#7'OnClick'#7#17'CancelButtonClick'#8'TabOrder'#2#2#0#0#7'T'
+  +'BitBtn'#8'OKButton'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRig'
+  +'ht.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSi'
+  +'deBottom.Side'#7#9'asrBottom'#4'Left'#3'g'#1#6'Height'#2#24#3'Top'#3'-'#1#5
+  +'Width'#2'3'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderS'
+  +'pacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#3'&OK'#21
+  +'Constraints.MaxHeight'#2'!'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2
+  +#1#9'NumGlyphs'#2#0#7'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#3#0#0#9'TGr'
+  +'oupBox'#15'OptionsGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anchor'
+  +'SideTop.Control'#7#19'ReplaceTextComboBox'#18'AnchorSideTop.Side'#7#9'asrBo'
+  +'ttom'#24'AnchorSideBottom.Control'#7#12'CancelButton'#4'Left'#2#6#6'Height'
+  +#3#229#0#3'Top'#2'B'#5'Width'#3#199#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akB'
+  +'ottom'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#20'BorderSpac'
+  +'ing.Bottom'#2#6#7'Caption'#6#15'OptionsGroupBox'#8'TabOrder'#2#4#0#9'TCheck'
+  +'Box'#23'PromptOnReplaceCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Le'
+  +'ft'#2#6#6'Height'#2#20#3'Top'#3#140#0#5'Width'#3#183#0#5'Align'#7#5'alTop'
+  +#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'Prom'
+  +'ptOnReplaceCheckBox'#7'Checked'#9#14'ParentShowHint'#8#8'ShowHint'#9#5'Stat'
+  +'e'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#9'TCheckBox'#17'MultiLineCheckBox'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#2'l'#5
+  +'Width'#3#183#0#5'Align'#7#5'alTop'#17'BorderSpacing.Top'#2#6#20'BorderSpaci'
+  +'ng.Around'#2#6#7'Caption'#6#17'MultiLineCheckBox'#7'Enabled'#8#14'ParentSho'
+  +'wHint'#8#8'ShowHint'#9#8'TabOrder'#2#1#0#0#9'TCheckBox'#26'RegularExpressio'
+  +'nsCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20
+  +#3'Top'#2'L'#5'Width'#3#183#0#5'Align'#7#5'alTop'#17'BorderSpacing.Top'#2#6
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#26'RegularExpressionsCheckBox'#14
+  ,'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#2#0#0#9'TCheckBox'#22'WholeWo'
+  +'rdsOnlyCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'
+  +#2#20#3'Top'#2','#5'Width'#3#183#0#5'Align'#7#5'alTop'#17'BorderSpacing.Top'
+  +#2#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#22'WholeWordsOnlyCheckBox'#14
+  +'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#3#0#0#9'TCheckBox'#21'CaseSen'
+  +'sitiveCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'
+  +#2#20#3'Top'#2#12#5'Width'#3#183#0#5'Align'#7#5'alTop'#17'BorderSpacing.Top'
+  +#2#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'CaseSensitiveCheckBox'#14
+  +'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#4#0#0#0#9'TGroupBox'#13'Scope'
+  +'GroupBox'#22'AnchorSideLeft.Control'#7#15'OptionsGroupBox'#19'AnchorSideLef'
+  +'t.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#14'OriginGroupBox'#18'An'
+  +'chorSideTop.Side'#7#9'asrBottom'#4'Left'#3#211#0#6'Height'#2'E'#3'Top'#3#141
+  +#0#5'Width'#3#199#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#13'ScopeGroupB'
+  +'ox'#8'TabOrder'#2#5#0#12'TRadioButton'#19'SelectedRadioButton'#4'Left'#2#3#6
+  +'Height'#2#20#3'Top'#2' '#5'Width'#3#189#0#5'Align'#7#5'alTop'#17'BorderSpac'
+  +'ing.Top'#2#6#20'BorderSpacing.Around'#2#3#7'Caption'#6#19'SelectedRadioButt'
+  +'on'#8'TabOrder'#2#0#0#0#12'TRadioButton'#17'GlobalRadioButton'#4'Left'#2#3#6
+  +'Height'#2#20#3'Top'#2#3#5'Width'#3#189#0#5'Align'#7#5'alTop'#20'BorderSpaci'
+  +'ng.Around'#2#3#7'Caption'#6#17'GlobalRadioButton'#7'Checked'#9#5'State'#7#9
+  +'cbChecked'#8'TabOrder'#2#1#0#0#0#9'TGroupBox'#17'DirectionGroupBox'#22'Anch'
+  +'orSideLeft.Control'#7#15'OptionsGroupBox'#19'AnchorSideLeft.Side'#7#9'asrBo'
+  +'ttom'#21'AnchorSideTop.Control'#7#13'ScopeGroupBox'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#4'Left'#3#211#0#6'Height'#2'E'#3'Top'#3#216#0#5'Width'#3#199#0
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'DirectionGroupBox'#8'TabOrder'
+  +#2#6#0#12'TRadioButton'#19'BackwardRadioButton'#4'Left'#2#3#6'Height'#2#20#3
+  +'Top'#2' '#5'Width'#3#189#0#5'Align'#7#5'alTop'#17'BorderSpacing.Top'#2#6#20
+  +'BorderSpacing.Around'#2#3#7'Caption'#6#19'BackwardRadioButton'#8'TabOrder'#2
+  +#0#0#0#12'TRadioButton'#18'ForwardRadioButton'#4'Left'#2#3#6'Height'#2#20#3
+  +'Top'#2#3#5'Width'#3#189#0#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#3#7
+  +'Caption'#6#18'ForwardRadioButton'#7'Checked'#9#5'State'#7#9'cbChecked'#8'Ta'
+  +'bOrder'#2#1#0#0#0#9'TGroupBox'#14'OriginGroupBox'#22'AnchorSideLeft.Control'
+  +#7#15'OptionsGroupBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideT'
+  +'op.Control'#7#19'ReplaceTextComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#4'Left'#3#211#0#6'Height'#2'E'#3'Top'#2'B'#5'Width'#3#199#0#20'BorderSpacin'
+  +'g.Around'#2#6#7'Caption'#6#14'OriginGroupBox'#8'TabOrder'#2#7#0#12'TRadioBu'
+  +'tton'#21'FromCursorRadioButton'#4'Left'#2#3#6'Height'#2#20#3'Top'#2#3#5'Wid'
+  +'th'#3#189#0#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#3#7'Caption'#6#21
+  +'FromCursorRadioButton'#7'Checked'#9#5'State'#7#9'cbChecked'#8'TabOrder'#2#0
+  +#0#0#12'TRadioButton'#22'EntireScopeRadioButton'#4'Left'#2#3#6'Height'#2#20#3
+  +'Top'#2#26#5'Width'#3#189#0#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#3
+  +#7'Caption'#6#22'EntireScopeRadioButton'#8'TabOrder'#2#1#0#0#0#7'TBitBtn'#16
+  +'ReplaceAllButton'#23'AnchorSideRight.Control'#7#8'OKButton'#24'AnchorSideBo'
+  +'ttom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
+  +'-'#1#6'Height'#2#28#3'Top'#3')'#1#5'Width'#2'4'#7'Anchors'#11#7'akRight'#8
+  +'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#4'&All'
+  +#21'Constraints.MaxHeight'#2'!'#4'Kind'#7#5'bkAll'#11'ModalResult'#2#8#9'Num'
+  +'Glyphs'#2#0#8'TabOrder'#2#8#0#0#0
 ]);
diff --git a/ide/findreplacedialog.pp b/ide/findreplacedialog.pp
index 53f785de1d..a61ac2b177 100644
--- a/ide/findreplacedialog.pp
+++ b/ide/findreplacedialog.pp
@@ -180,13 +180,7 @@ procedure TLazFindReplaceDialog.TextToFindComboBoxKeyDown(
 var Component: TFindDlgComponent;
 begin
   //debugln('TLazFindReplaceDialog.TextToFindComboBoxKeyDown Key=',Key,' RETURN=',VK_RETURN,' TAB=',VK_TAB,' DOWN=',VK_DOWN,' UP=',VK_UP);
-  if (Key=VK_RETURN) then begin
-    OkButtonClick(Sender);
-    Key:=VK_UNKNOWN;
-  end else if (Key=VK_ESCAPE) then begin
-    CancelButtonClick(Sender);
-    Key:=VK_UNKNOWN;
-  end else if Assigned(OnKey) then begin
+  if Assigned(OnKey) then begin
     if Sender=TextToFindComboBox then
       Component:=fdcText
     else
diff --git a/ide/main.pp b/ide/main.pp
index 8d4515f515..8074adbbf6 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -7740,10 +7740,10 @@ begin
 
   Result := mrCancel;
 
-{$IFNDEF DoNotUseProcessDebugger}
+  {$IFNDEF DoNotUseProcessDebugger}
   Result := DebugBoss.RunDebugger;
 //  if Result<>mrOk then exit;
-{$ELSE}
+  {$ELSE}
   if EnvironmentOptions.IsDebuggerClassDefined
   then begin
     Result := DebugBoss.RunDebugger;
@@ -7771,7 +7771,7 @@ begin
       ToolStatus:=itNone;
     end;
   end;
-{$ENDIF}
+  {$ENDIF}
 
   DebugLn('[TMainIDE.DoRunProject] END');
 end;