diff --git a/ide/frames/editor_codefolding_mouse_options.lfm b/ide/frames/editor_codefolding_mouse_options.lfm
index 5417198344..9d57577fb0 100644
--- a/ide/frames/editor_codefolding_mouse_options.lfm
+++ b/ide/frames/editor_codefolding_mouse_options.lfm
@@ -22,7 +22,6 @@ inherited MouseGroupBox1: TMouseGroupBox1
     BorderSpacing.Bottom = 6
     ItemHeight = 0
     OnClick = MouseConfListBoxClick
-    OnExit = MouseConfListBoxClick
     OnKeyUp = MouseConfListBoxKeyUp
     TabOrder = 0
   end
@@ -56,7 +55,6 @@ inherited MouseGroupBox1: TMouseGroupBox1
       Caption = 'MouseEnabled1'
       OnChange = MouseEnabled1Change
       OnClick = MouseEnabled1Change
-      OnExit = MouseEnabled1Change
       TabOrder = 0
     end
     object MouseRadioGroup1: TRadioGroup
@@ -85,7 +83,6 @@ inherited MouseGroupBox1: TMouseGroupBox1
       ChildSizing.Layout = cclLeftToRightThenTopToBottom
       ChildSizing.ControlsPerLine = 1
       OnClick = MouseEnabled1Change
-      OnExit = MouseEnabled1Change
       TabOrder = 1
     end
     object MouseShift1: TCheckBox
@@ -102,7 +99,6 @@ inherited MouseGroupBox1: TMouseGroupBox1
       Caption = 'MouseShift1'
       OnChange = MouseEnabled1Change
       OnClick = MouseEnabled1Change
-      OnExit = MouseEnabled1Change
       TabOrder = 2
     end
     object MouseCtrl1: TCheckBox
@@ -120,7 +116,6 @@ inherited MouseGroupBox1: TMouseGroupBox1
       Caption = 'MouseCtrl1'
       OnChange = MouseEnabled1Change
       OnClick = MouseEnabled1Change
-      OnExit = MouseEnabled1Change
       TabOrder = 3
     end
     object MouseAlt1: TCheckBox
@@ -138,7 +133,6 @@ inherited MouseGroupBox1: TMouseGroupBox1
       Caption = 'MouseAlt1'
       OnChange = MouseEnabled1Change
       OnClick = MouseEnabled1Change
-      OnExit = MouseEnabled1Change
       TabOrder = 4
     end
   end
@@ -174,7 +168,6 @@ inherited MouseGroupBox1: TMouseGroupBox1
       Caption = 'MouseEnabled2'
       OnChange = MouseEnabled1Change
       OnClick = MouseEnabled1Change
-      OnExit = MouseEnabled1Change
       TabOrder = 0
     end
     object MouseRadioGroup2: TRadioGroup
@@ -203,7 +196,6 @@ inherited MouseGroupBox1: TMouseGroupBox1
       ChildSizing.Layout = cclLeftToRightThenTopToBottom
       ChildSizing.ControlsPerLine = 1
       OnClick = MouseEnabled1Change
-      OnExit = MouseEnabled1Change
       TabOrder = 1
     end
     object MouseShift2: TCheckBox
@@ -219,7 +211,6 @@ inherited MouseGroupBox1: TMouseGroupBox1
       Caption = 'MouseShift2'
       OnChange = MouseEnabled1Change
       OnClick = MouseEnabled1Change
-      OnExit = MouseEnabled1Change
       TabOrder = 2
     end
     object MouseCtrl2: TCheckBox
@@ -237,7 +228,6 @@ inherited MouseGroupBox1: TMouseGroupBox1
       Caption = 'MouseCtrl2'
       OnChange = MouseEnabled1Change
       OnClick = MouseEnabled1Change
-      OnExit = MouseEnabled1Change
       TabOrder = 3
     end
     object MouseAlt2: TCheckBox
@@ -255,7 +245,6 @@ inherited MouseGroupBox1: TMouseGroupBox1
       Caption = 'MouseAlt2'
       OnChange = MouseEnabled1Change
       OnClick = MouseEnabled1Change
-      OnExit = MouseEnabled1Change
       TabOrder = 4
     end
   end
diff --git a/ide/frames/editor_codefolding_mouse_options.lrs b/ide/frames/editor_codefolding_mouse_options.lrs
index 7741ebe808..26bcd65ed0 100644
--- a/ide/frames/editor_codefolding_mouse_options.lrs
+++ b/ide/frames/editor_codefolding_mouse_options.lrs
@@ -9,20 +9,19 @@ LazarusResources.Add('TMouseGroupBox1','FORMDATA',[
   +'ottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3'B'#1#3'Top'#2#6#5'Width'
   +#3#200#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#18'BorderSpacing.Lef'
   +'t'#2#6#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Bottom'#2#6#10'ItemHeight'
-  +#2#0#7'OnClick'#7#21'MouseConfListBoxClick'#6'OnExit'#7#21'MouseConfListBoxC'
-  +'lick'#7'OnKeyUp'#7#21'MouseConfListBoxKeyUp'#8'TabOrder'#2#0#0#0#242#2#1#9
-  +'TGroupBox'#14'MouseGroupBox1'#22'AnchorSideLeft.Control'#7#16'MouseConfList'
-  +'Box'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#16
-  +'MouseConfListBox'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight'
-  +'.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2'|'#3'Top'#2#6#5'Width'#3
-  +'/'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#18'BorderS'
-  +'pacing.Left'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#14'MouseGroupBox1'
-  +#12'ClientHeight'#2'j'#11'ClientWidth'#3'+'#1#8'TabOrder'#2#1#0#9'TCheckBox'
-  +#13'MouseEnabled1'#22'AnchorSideLeft.Control'#7#14'MouseGroupBox1'#21'Anchor'
-  +'SideTop.Control'#7#14'MouseGroupBox1'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#6
-  +#5'Width'#2'a'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Captio'
-  +'n'#6#13'MouseEnabled1'#8'OnChange'#7#19'MouseEnabled1Change'#7'OnClick'#7#19
-  +'MouseEnabled1Change'#6'OnExit'#7#19'MouseEnabled1Change'#8'TabOrder'#2#0#0#0
+  +#2#0#7'OnClick'#7#21'MouseConfListBoxClick'#7'OnKeyUp'#7#21'MouseConfListBox'
+  +'KeyUp'#8'TabOrder'#2#0#0#0#242#2#1#9'TGroupBox'#14'MouseGroupBox1'#22'Ancho'
+  +'rSideLeft.Control'#7#16'MouseConfListBox'#19'AnchorSideLeft.Side'#7#9'asrBo'
+  +'ttom'#21'AnchorSideTop.Control'#7#16'MouseConfListBox'#23'AnchorSideRight.C'
+  +'ontrol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#212#0#6
+  +'Height'#2'|'#3'Top'#2#6#5'Width'#3'/'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'
+  +#2#6#7'Caption'#6#14'MouseGroupBox1'#12'ClientHeight'#2'j'#11'ClientWidth'#3
+  +'+'#1#8'TabOrder'#2#1#0#9'TCheckBox'#13'MouseEnabled1'#22'AnchorSideLeft.Con'
+  +'trol'#7#14'MouseGroupBox1'#21'AnchorSideTop.Control'#7#14'MouseGroupBox1'#4
+  +'Left'#2#6#6'Height'#2#19#3'Top'#2#6#5'Width'#2'a'#18'BorderSpacing.Left'#2#6
+  +#17'BorderSpacing.Top'#2#6#7'Caption'#6#13'MouseEnabled1'#8'OnChange'#7#19'M'
+  +'ouseEnabled1Change'#7'OnClick'#7#19'MouseEnabled1Change'#8'TabOrder'#2#0#0#0
   +#11'TRadioGroup'#16'MouseRadioGroup1'#22'AnchorSideLeft.Control'#7#14'MouseG'
   +'roupBox1'#21'AnchorSideTop.Control'#7#13'MouseEnabled1'#18'AnchorSideTop.Si'
   +'de'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#14'MouseGroupBox1'#21'Anc'
@@ -35,70 +34,65 @@ LazarusResources.Add('TMouseGroupBox1','FORMDATA',[
   +#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScale'
   +'Childs'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.'
   +'Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'
-  +#2#1#7'OnClick'#7#19'MouseEnabled1Change'#6'OnExit'#7#19'MouseEnabled1Change'
-  +#8'TabOrder'#2#1#0#0#9'TCheckBox'#11'MouseShift1'#22'AnchorSideLeft.Control'
-  +#7#16'MouseRadioGroup1'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSide'
-  +'Top.Control'#7#16'MouseRadioGroup1'#4'Left'#3#136#0#6'Height'#2#19#3'Top'#2
-  +'%'#5'Width'#2'O'#11'AllowGrayed'#9#18'BorderSpacing.Left'#2#6#17'BorderSpac'
-  +'ing.Top'#2#6#7'Caption'#6#11'MouseShift1'#8'OnChange'#7#19'MouseEnabled1Cha'
-  +'nge'#7'OnClick'#7#19'MouseEnabled1Change'#6'OnExit'#7#19'MouseEnabled1Chang'
-  +'e'#8'TabOrder'#2#2#0#0#9'TCheckBox'#10'MouseCtrl1'#22'AnchorSideLeft.Contro'
-  +'l'#7#16'MouseRadioGroup1'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorS'
-  +'ideTop.Control'#7#11'MouseShift1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'L'
-  +'eft'#3#136#0#6'Height'#2#19#3'Top'#2'>'#5'Width'#2'I'#11'AllowGrayed'#9#18
-  +'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#10'MouseCtrl'
-  +'1'#8'OnChange'#7#19'MouseEnabled1Change'#7'OnClick'#7#19'MouseEnabled1Chang'
-  +'e'#6'OnExit'#7#19'MouseEnabled1Change'#8'TabOrder'#2#3#0#0#9'TCheckBox'#9'M'
-  +'ouseAlt1'#22'AnchorSideLeft.Control'#7#16'MouseRadioGroup1'#19'AnchorSideLe'
-  +'ft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#10'MouseCtrl1'#18'Ancho'
-  +'rSideTop.Side'#7#9'asrBottom'#4'Left'#3#136#0#6'Height'#2#19#3'Top'#2'W'#5
-  +'Width'#2'F'#11'AllowGrayed'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing.T'
-  +'op'#2#6#7'Caption'#6#9'MouseAlt1'#8'OnChange'#7#19'MouseEnabled1Change'#7'O'
-  +'nClick'#7#19'MouseEnabled1Change'#6'OnExit'#7#19'MouseEnabled1Change'#8'Tab'
-  +'Order'#2#4#0#0#0#242#2#2#9'TGroupBox'#14'MouseGroupBox2'#22'AnchorSideLeft.'
-  +'Control'#7#16'MouseConfListBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'A'
-  +'nchorSideTop.Control'#7#14'MouseGroupBox1'#18'AnchorSideTop.Side'#7#9'asrBo'
-  +'ttom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'a'
-  +'srBottom'#4'Left'#3#212#0#6'Height'#3#132#0#3'Top'#3#136#0#5'Width'#3'/'#1#7
-  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#18'BorderSpacing.'
-  +'Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6
-  +#14'MouseGroupBox2'#12'ClientHeight'#2'r'#11'ClientWidth'#3'+'#1#8'TabOrder'
-  +#2#2#0#9'TCheckBox'#13'MouseEnabled2'#22'AnchorSideLeft.Control'#7#14'MouseG'
-  +'roupBox2'#21'AnchorSideTop.Control'#7#14'MouseGroupBox2'#4'Left'#2#6#6'Heig'
-  ,'ht'#2#19#3'Top'#2#6#5'Width'#2'a'#18'BorderSpacing.Left'#2#6#17'BorderSpaci'
-  +'ng.Top'#2#6#7'Caption'#6#13'MouseEnabled2'#8'OnChange'#7#19'MouseEnabled1Ch'
-  +'ange'#7'OnClick'#7#19'MouseEnabled1Change'#6'OnExit'#7#19'MouseEnabled1Chan'
-  +'ge'#8'TabOrder'#2#0#0#0#11'TRadioGroup'#16'MouseRadioGroup2'#22'AnchorSideL'
-  +'eft.Control'#7#14'MouseGroupBox2'#21'AnchorSideTop.Control'#7#13'MouseEnabl'
-  +'ed2'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#14
-  +'MouseGroupBox2'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heig'
-  +'ht'#2'M'#3'Top'#2#31#5'Width'#2'|'#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBot'
-  +'tom'#0#8'AutoFill'#9#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#17'BorderSpac'
-  +'ing.Top'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#16'MouseRadioGroup2'
-  +#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29
-  +'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizin'
-  +'g.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHori'
-  +'zontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleCh'
-  +'ilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSi'
-  +'zing.ControlsPerLine'#2#1#7'OnClick'#7#19'MouseEnabled1Change'#6'OnExit'#7
-  +#19'MouseEnabled1Change'#8'TabOrder'#2#1#0#0#9'TCheckBox'#11'MouseShift2'#22
-  +'AnchorSideLeft.Control'#7#16'MouseRadioGroup2'#19'AnchorSideLeft.Side'#7#9
-  +'asrBottom'#21'AnchorSideTop.Control'#7#16'MouseRadioGroup2'#4'Left'#3#136#0
-  +#6'Height'#2#19#3'Top'#2#31#5'Width'#2'O'#11'AllowGrayed'#9#18'BorderSpacing'
-  +'.Left'#2#6#7'Caption'#6#11'MouseShift2'#8'OnChange'#7#19'MouseEnabled1Chang'
-  +'e'#7'OnClick'#7#19'MouseEnabled1Change'#6'OnExit'#7#19'MouseEnabled1Change'
-  +#8'TabOrder'#2#2#0#0#9'TCheckBox'#10'MouseCtrl2'#22'AnchorSideLeft.Control'#7
-  +#16'MouseRadioGroup2'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTo'
-  +'p.Control'#7#11'MouseShift2'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3
-  +#136#0#6'Height'#2#19#3'Top'#2'8'#5'Width'#2'I'#11'AllowGrayed'#9#18'BorderS'
-  +'pacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#10'MouseCtrl2'#8'On'
-  +'Change'#7#19'MouseEnabled1Change'#7'OnClick'#7#19'MouseEnabled1Change'#6'On'
-  +'Exit'#7#19'MouseEnabled1Change'#8'TabOrder'#2#3#0#0#9'TCheckBox'#9'MouseAlt'
+  +#2#1#7'OnClick'#7#19'MouseEnabled1Change'#8'TabOrder'#2#1#0#0#9'TCheckBox'#11
+  +'MouseShift1'#22'AnchorSideLeft.Control'#7#16'MouseRadioGroup1'#19'AnchorSid'
+  +'eLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#16'MouseRadioGroup1'
+  +#4'Left'#3#136#0#6'Height'#2#19#3'Top'#2'%'#5'Width'#2'O'#11'AllowGrayed'#9
+  +#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#11'MouseS'
+  +'hift1'#8'OnChange'#7#19'MouseEnabled1Change'#7'OnClick'#7#19'MouseEnabled1C'
+  +'hange'#8'TabOrder'#2#2#0#0#9'TCheckBox'#10'MouseCtrl1'#22'AnchorSideLeft.Co'
+  +'ntrol'#7#16'MouseRadioGroup1'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Anc'
+  +'horSideTop.Control'#7#11'MouseShift1'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#4'Left'#3#136#0#6'Height'#2#19#3'Top'#2'>'#5'Width'#2'I'#11'AllowGrayed'#9
+  +#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#10'MouseC'
+  +'trl1'#8'OnChange'#7#19'MouseEnabled1Change'#7'OnClick'#7#19'MouseEnabled1Ch'
+  +'ange'#8'TabOrder'#2#3#0#0#9'TCheckBox'#9'MouseAlt1'#22'AnchorSideLeft.Contr'
+  +'ol'#7#16'MouseRadioGroup1'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Anchor'
+  +'SideTop.Control'#7#10'MouseCtrl1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'L'
+  +'eft'#3#136#0#6'Height'#2#19#3'Top'#2'W'#5'Width'#2'F'#11'AllowGrayed'#9#18
+  +'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#9'MouseAlt1'
+  +#8'OnChange'#7#19'MouseEnabled1Change'#7'OnClick'#7#19'MouseEnabled1Change'#8
+  +'TabOrder'#2#4#0#0#0#242#2#2#9'TGroupBox'#14'MouseGroupBox2'#22'AnchorSideLe'
+  +'ft.Control'#7#16'MouseConfListBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
+  +'AnchorSideTop.Control'#7#14'MouseGroupBox1'#18'AnchorSideTop.Side'#7#9'asrB'
+  +'ottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#3#212#0#6'Height'#3#132#0#3'Top'#3#136#0#5'Width'#3'/'#1
+  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#18'BorderSpacin'
+  +'g.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'
+  +#6#14'MouseGroupBox2'#12'ClientHeight'#2'r'#11'ClientWidth'#3'+'#1#8'TabOrde'
+  +'r'#2#2#0#9'TCheckBox'#13'MouseEnabled2'#22'AnchorSideLeft.Control'#7#14'Mou'
+  +'seGroupBox2'#21'AnchorSideTop.Control'#7#14'MouseGroupBox2'#4'Left'#2#6#6'H'
+  +'eight'#2#19#3'Top'#2#6#5'Width'#2'a'#18'BorderSpacing.Left'#2#6#17'BorderSp'
+  +'acing.Top'#2#6#7'Caption'#6#13'MouseEnabled2'#8'OnChange'#7#19'MouseEnabled'
+  +'1Change'#7'OnClick'#7#19'MouseEnabled1Change'#8'TabOrder'#2#0#0#0#11'TRadio'
+  ,'Group'#16'MouseRadioGroup2'#22'AnchorSideLeft.Control'#7#14'MouseGroupBox2'
+  +#21'AnchorSideTop.Control'#7#13'MouseEnabled2'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#24'AnchorSideBottom.Control'#7#14'MouseGroupBox2'#21'AnchorSideBot'
+  +'tom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'M'#3'Top'#2#31#5'Width'#2
+  +'|'#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#8'AutoFill'#9#8'AutoSize'
+  +#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Bot'
+  +'tom'#2#6#7'Caption'#6#16'MouseRadioGroup2'#28'ChildSizing.LeftRightSpacing'
+  +#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7
+  +#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomoge'
+  +'nousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'C'
+  +'hildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29
+  +'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#7'OnClic'
+  +'k'#7#19'MouseEnabled1Change'#8'TabOrder'#2#1#0#0#9'TCheckBox'#11'MouseShift'
   +'2'#22'AnchorSideLeft.Control'#7#16'MouseRadioGroup2'#19'AnchorSideLeft.Side'
-  +#7#9'asrBottom'#21'AnchorSideTop.Control'#7#10'MouseCtrl2'#18'AnchorSideTop.'
-  +'Side'#7#9'asrBottom'#4'Left'#3#136#0#6'Height'#2#19#3'Top'#2'Q'#5'Width'#2
-  +'F'#11'AllowGrayed'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7
-  +'Caption'#6#9'MouseAlt2'#8'OnChange'#7#19'MouseEnabled1Change'#7'OnClick'#7
-  +#19'MouseEnabled1Change'#6'OnExit'#7#19'MouseEnabled1Change'#8'TabOrder'#2#4
-  +#0#0#0#0
+  +#7#9'asrBottom'#21'AnchorSideTop.Control'#7#16'MouseRadioGroup2'#4'Left'#3
+  +#136#0#6'Height'#2#19#3'Top'#2#31#5'Width'#2'O'#11'AllowGrayed'#9#18'BorderS'
+  +'pacing.Left'#2#6#7'Caption'#6#11'MouseShift2'#8'OnChange'#7#19'MouseEnabled'
+  +'1Change'#7'OnClick'#7#19'MouseEnabled1Change'#8'TabOrder'#2#2#0#0#9'TCheckB'
+  +'ox'#10'MouseCtrl2'#22'AnchorSideLeft.Control'#7#16'MouseRadioGroup2'#19'Anc'
+  +'horSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#11'MouseShift2'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#136#0#6'Height'#2#19#3'Top'
+  +#2'8'#5'Width'#2'I'#11'AllowGrayed'#9#18'BorderSpacing.Left'#2#6#17'BorderSp'
+  +'acing.Top'#2#6#7'Caption'#6#10'MouseCtrl2'#8'OnChange'#7#19'MouseEnabled1Ch'
+  +'ange'#7'OnClick'#7#19'MouseEnabled1Change'#8'TabOrder'#2#3#0#0#9'TCheckBox'
+  +#9'MouseAlt2'#22'AnchorSideLeft.Control'#7#16'MouseRadioGroup2'#19'AnchorSid'
+  +'eLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#10'MouseCtrl2'#18'An'
+  +'chorSideTop.Side'#7#9'asrBottom'#4'Left'#3#136#0#6'Height'#2#19#3'Top'#2'Q'
+  +#5'Width'#2'F'#11'AllowGrayed'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing'
+  +'.Top'#2#6#7'Caption'#6#9'MouseAlt2'#8'OnChange'#7#19'MouseEnabled1Change'#7
+  +'OnClick'#7#19'MouseEnabled1Change'#8'TabOrder'#2#4#0#0#0#0
 ]);
diff --git a/ide/frames/editor_codefolding_mouse_options.pas b/ide/frames/editor_codefolding_mouse_options.pas
index 20fddadba7..ccc15f3fe5 100644
--- a/ide/frames/editor_codefolding_mouse_options.pas
+++ b/ide/frames/editor_codefolding_mouse_options.pas
@@ -26,7 +26,7 @@ interface
 
 uses
   LResources, EditorOptions, LazarusIDEStrConsts, IDEOptionsIntf,
-  StdCtrls, ExtCtrls, Classes, Controls,
+  StdCtrls, ExtCtrls, Classes, Controls, LCLProc,
   SynGutterCodeFolding;
 
 type
@@ -51,6 +51,7 @@ type
     procedure MouseConfListBoxKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure MouseEnabled1Change(Sender: TObject);
   private
+    ListBoxUpdating: Boolean;
     FExpandedClickConf,
     FCollapsedClickConf: TSynGutterFoldClickConfList;
   protected
@@ -82,6 +83,7 @@ var
     Result := cbUnchecked;
   end;
 begin
+  ListBoxUpdating := True;
   case MouseConfListBox.ItemIndex of
     0: c  := FExpandedClickConf[sgctFoldOne];
     1: c  := FExpandedClickConf[sgctFoldAll];
@@ -100,6 +102,7 @@ begin
   MouseShift2.State := GetState2(ssShift);
   MouseCtrl2.State := GetState2(ssCtrl);
   MouseAlt2.State := GetState2(ssAlt);
+  ListBoxUpdating := False;
 end;
 
 procedure TMouseGroupBox1.MouseConfListBoxKeyUp(Sender: TObject; var Key: Word;
@@ -112,6 +115,7 @@ procedure TMouseGroupBox1.MouseEnabled1Change(Sender: TObject);
 var
   c: TSynGutterFoldClickConf;
 begin
+  if ListBoxUpdating then exit;
   c.Enabled := MouseEnabled1.Checked;
   c.Button := TMouseButton(MouseRadioGroup1.ItemIndex);
   c.Shift := [];
@@ -177,9 +181,6 @@ begin
   MouseShift2.Caption := dlgMouseFoldModifierShift;
   MouseCtrl2.Caption := dlgMouseFoldModifierCtrl;
   MouseAlt2.Caption := dlgMouseFoldModifierAlt;
-
-  MouseConfListBox.ItemIndex := 0;
-  MouseConfListBoxClick(nil);
 end;
 
 procedure TMouseGroupBox1.ReadSettings(