diff --git a/.gitattributes b/.gitattributes
index 4528f94b65..cb3ecd2b49 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2885,9 +2885,6 @@ ide/frames/editor_keymapping_options.pas svneol=native#text/pascal
 ide/frames/editor_mouseaction_options.lfm svneol=native#text/plain
 ide/frames/editor_mouseaction_options.lrs svneol=native#text/plain
 ide/frames/editor_mouseaction_options.pas svneol=native#text/pascal
-ide/frames/editor_mouseaction_options_dlg.lfm svneol=native#text/plain
-ide/frames/editor_mouseaction_options_dlg.lrs svneol=native#text/plain
-ide/frames/editor_mouseaction_options_dlg.pas svneol=native#text/pascal
 ide/frames/files_options.lfm svneol=native#text/plain
 ide/frames/files_options.lrs svneol=native#text/pascal
 ide/frames/files_options.pas svneol=native#text/pascal
@@ -2984,6 +2981,9 @@ ide/makeresstrdlg.lfm svneol=native#text/plain
 ide/makeresstrdlg.lrs svneol=native#text/plain
 ide/makeresstrdlg.pas svneol=native#text/pascal
 ide/miscoptions.pas svneol=native#text/pascal
+ide/mouseactiondialog.lfm svneol=native#text/plain
+ide/mouseactiondialog.lrs svneol=native#text/plain
+ide/mouseactiondialog.pas svneol=native#text/pascal
 ide/msgquickfixes.pas svneol=native#text/plain
 ide/msgview.lfm svneol=native#text/plain
 ide/msgview.lrs svneol=native#text/plain
diff --git a/ide/frames/editor_mouseaction_options.lfm b/ide/frames/editor_mouseaction_options.lfm
index 2e7976cb9d..6f921baa75 100644
--- a/ide/frames/editor_mouseaction_options.lfm
+++ b/ide/frames/editor_mouseaction_options.lfm
@@ -5,8 +5,8 @@ inherited EditorMouseOptionsFrame: TEditorMouseOptionsFrame
   ClientHeight = 415
   ClientWidth = 610
   Visible = False
-  DesignLeft = 276
-  DesignTop = 195
+  DesignLeft = 246
+  DesignTop = 209
   object p2: TPanel[0]
     Left = 0
     Height = 378
@@ -46,7 +46,7 @@ inherited EditorMouseOptionsFrame: TEditorMouseOptionsFrame
       Width = 130
       Align = alLeft
       AutoExpand = True
-      Constraints.MinWidth = 25
+      Constraints.MinWidth = 80
       DefaultItemHeight = 17
       ReadOnly = True
       TabOrder = 1
@@ -58,7 +58,8 @@ inherited EditorMouseOptionsFrame: TEditorMouseOptionsFrame
       Height = 378
       Top = 0
       Width = 5
-      MinSize = 100
+      MinSize = 1
+      OnCanResize = Splitter1CanResize
     end
   end
   object p3: TPanel[1]
diff --git a/ide/frames/editor_mouseaction_options.lrs b/ide/frames/editor_mouseaction_options.lrs
index 31fac601fa..8e1717d2e4 100644
--- a/ide/frames/editor_mouseaction_options.lrs
+++ b/ide/frames/editor_mouseaction_options.lrs
@@ -3,7 +3,7 @@
 LazarusResources.Add('TEditorMouseOptionsFrame','FORMDATA',[
   'TPF0'#241#24'TEditorMouseOptionsFrame'#23'EditorMouseOptionsFrame'#6'Height'
   +#3#159#1#5'Width'#3'b'#2#7'Anchors'#11#5'akTop'#0#12'ClientHeight'#3#159#1#11
-  +'ClientWidth'#3'b'#2#7'Visible'#8#10'DesignLeft'#3#20#1#9'DesignTop'#3#195#0
+  +'ClientWidth'#3'b'#2#7'Visible'#8#10'DesignLeft'#3#246#0#9'DesignTop'#3#209#0
   +#0#242#2#0#6'TPanel'#2'p2'#4'Left'#2#0#6'Height'#3'z'#1#3'Top'#2#0#5'Width'#3
   +'b'#2#5'Align'#7#8'alClient'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#3'z'
   +#1#11'ClientWidth'#3'b'#2#8'TabOrder'#2#0#0#11'TStringGrid'#10'ActionGrid'#24
@@ -17,28 +17,29 @@ LazarusResources.Add('TEditorMouseOptionsFrame','FORMDATA',[
   +'useDown'#11'OnMouseMove'#7#19'ActionGridMouseMove'#9'OnMouseUp'#7#17'Action'
   +'GridMouseUp'#8'OnResize'#7#16'ActionGridResize'#0#0#9'TTreeView'#11'Context'
   +'Tree'#4'Left'#2#0#6'Height'#3'z'#1#3'Top'#2#0#5'Width'#3#130#0#5'Align'#7#6
-  +'alLeft'#10'AutoExpand'#9#20'Constraints.MinWidth'#2#25#17'DefaultItemHeight'
+  +'alLeft'#10'AutoExpand'#9#20'Constraints.MinWidth'#2'P'#17'DefaultItemHeight'
   +#2#17#8'ReadOnly'#9#8'TabOrder'#2#1#8'OnChange'#7#17'ContextTreeChange'#7'Op'
   +'tions'#11#13'tvoAutoExpand'#17'tvoAutoItemHeight'#16'tvoHideSelection'#21't'
   +'voKeepCollapsedNodes'#11'tvoReadOnly'#14'tvoShowButtons'#12'tvoShowLines'#11
   +'tvoShowRoot'#11'tvoToolTips'#0#0#0#9'TSplitter'#9'Splitter1'#4'Left'#3#130#0
-  +#6'Height'#3'z'#1#3'Top'#2#0#5'Width'#2#5#7'MinSize'#2'd'#0#0#0#242#2#1#6'TP'
-  +'anel'#2'p3'#23'AnchorSideRight.Control'#7#2'p2'#20'AnchorSideRight.Side'#7#9
-  +'asrBottom'#24'AnchorSideBottom.Control'#7#2'p2'#21'AnchorSideBottom.Side'#7
-  +#9'asrBottom'#4'Left'#2#0#6'Height'#2'%'#3'Top'#3'z'#1#5'Width'#3'b'#2#5'Ali'
-  +'gn'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'
-  +#2'%'#11'ClientWidth'#3'b'#2#8'TabOrder'#2#1#0#7'TButton'#9'DelButton'#22'An'
-  +'chorSideLeft.Control'#7#2'p3'#21'AnchorSideTop.Control'#7#2'p3'#4'Left'#2#0
-  +#6'Height'#2#25#3'Top'#2#6#5'Width'#2'O'#8'AutoSize'#9#17'BorderSpacing.Top'
-  +#2#6#7'Caption'#6#9'DelButton'#7'OnClick'#7#14'DelButtonClick'#8'TabOrder'#2
-  +#2#0#0#7'TButton'#12'AddNewButton'#21'AnchorSideTop.Control'#7#12'UpdateButt'
-  +'on'#23'AnchorSideRight.Control'#7#2'p3'#20'AnchorSideRight.Side'#7#9'asrBot'
-  +'tom'#4'Left'#3#246#1#6'Height'#2#25#3'Top'#2#6#5'Width'#2'l'#7'Anchors'#11#5
-  +'akTop'#7'akRight'#0#8'AutoSize'#9#7'Caption'#6#12'AddNewButton'#7'OnClick'#7
-  +#17'AddNewButtonClick'#8'TabOrder'#2#0#0#0#7'TButton'#12'UpdateButton'#21'An'
-  +'chorSideTop.Control'#7#2'p3'#23'AnchorSideRight.Control'#7#12'AddNewButton'
-  +#4'Left'#3#140#1#6'Height'#2#25#3'Top'#2#6#5'Width'#2'd'#7'Anchors'#11#5'akT'
-  +'op'#7'akRight'#0#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#19'BorderSpacing.R'
-  +'ight'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#12'UpdateButton'#7'OnCl'
-  +'ick'#7#17'UpdateButtonClick'#8'TabOrder'#2#1#0#0#0#0
+  +#6'Height'#3'z'#1#3'Top'#2#0#5'Width'#2#5#7'MinSize'#2#1#11'OnCanResize'#7#18
+  +'Splitter1CanResize'#0#0#0#242#2#1#6'TPanel'#2'p3'#23'AnchorSideRight.Contro'
+  +'l'#7#2'p2'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Cont'
+  +'rol'#7#2'p2'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'
+  +#2'%'#3'Top'#3'z'#1#5'Width'#3'b'#2#5'Align'#7#8'alBottom'#8'AutoSize'#9#10
+  +'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'%'#11'ClientWidth'#3'b'#2#8'TabO'
+  +'rder'#2#1#0#7'TButton'#9'DelButton'#22'AnchorSideLeft.Control'#7#2'p3'#21'A'
+  +'nchorSideTop.Control'#7#2'p3'#4'Left'#2#0#6'Height'#2#25#3'Top'#2#6#5'Width'
+  +#2'O'#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#7'Caption'#6#9'DelButton'#7'On'
+  +'Click'#7#14'DelButtonClick'#8'TabOrder'#2#2#0#0#7'TButton'#12'AddNewButton'
+  +#21'AnchorSideTop.Control'#7#12'UpdateButton'#23'AnchorSideRight.Control'#7#2
+  +'p3'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#246#1#6'Height'#2#25#3
+  +'Top'#2#6#5'Width'#2'l'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#7
+  +'Caption'#6#12'AddNewButton'#7'OnClick'#7#17'AddNewButtonClick'#8'TabOrder'#2
+  +#0#0#0#7'TButton'#12'UpdateButton'#21'AnchorSideTop.Control'#7#2'p3'#23'Anch'
+  +'orSideRight.Control'#7#12'AddNewButton'#4'Left'#3#140#1#6'Height'#2#25#3'To'
+  +'p'#2#6#5'Width'#2'd'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#17'B'
+  +'orderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2
+  +#6#7'Caption'#6#12'UpdateButton'#7'OnClick'#7#17'UpdateButtonClick'#8'TabOrd'
+  +'er'#2#1#0#0#0#0
 ]);
diff --git a/ide/frames/editor_mouseaction_options.pas b/ide/frames/editor_mouseaction_options.pas
index ed7570a6a8..8a52dcb2a4 100644
--- a/ide/frames/editor_mouseaction_options.pas
+++ b/ide/frames/editor_mouseaction_options.pas
@@ -27,7 +27,7 @@ interface
 uses
   LResources, EditorOptions, LazarusIDEStrConsts, IDEOptionsIntf, sysutils,
   StdCtrls, ExtCtrls, Classes, Controls, LCLProc, Grids, ComCtrls, Dialogs,
-  SynEditMouseCmds, editor_mouseaction_options_dlg, math;
+  SynEditMouseCmds, MouseActionDialog, math;
 
 type
 
@@ -49,6 +49,7 @@ type
       Y: Integer);
     procedure ContextTreeChange(Sender: TObject; Node: TTreeNode);
     procedure AddNewButtonClick(Sender: TObject);
+    procedure Splitter1CanResize(Sender: TObject; var NewSize: Integer; var Accept: Boolean);
     procedure UpdateButtonClick(Sender: TObject);
     procedure DelButtonClick(Sender: TObject);
     procedure ActionGridHeaderSized(Sender: TObject; IsColumn: Boolean; Index: Integer);
@@ -58,7 +59,7 @@ type
     FCurNode: TTreeNode;
     FMainActions, FSelActions: TSynEditMouseActions;
     FCurActions: TSynEditMouseActions;
-    ChangeDlg: TEditorMouseOptionsChangeDialog;
+    ChangeDlg: TMouseaActionDialog;
     FColWidths: Array of Integer;
     FLastWidth: Integer;
     FIsHeaderSizing: Boolean;
@@ -136,6 +137,12 @@ begin
   end;
 end;
 
+procedure TEditorMouseOptionsFrame.Splitter1CanResize(Sender: TObject; var NewSize: Integer;
+  var Accept: Boolean);
+begin
+
+end;
+
 procedure TEditorMouseOptionsFrame.UpdateButtonClick(Sender: TObject);
 var
   MAct, MOld: TSynEditMouseAction;
@@ -232,7 +239,7 @@ begin
   inherited Create(AOwner);
   FMainActions := TSynEditMouseActions.Create(nil);
   FSelActions := TSynEditMouseActions.Create(nil);
-  ChangeDlg := TEditorMouseOptionsChangeDialog.Create(self);
+  ChangeDlg := TMouseaActionDialog.Create(self);
   ActionGrid.Constraints.MinWidth := ActionGrid.ColCount * MinGridColSize;
 end;
 
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index a1e085bc50..5d73e158e4 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -1202,6 +1202,8 @@ resourcestring
   dlgMouseOptCaretMove = 'Move Caret (extra)';
   dlgMouseOptErrorDup = 'Duplicate Entry';
   dlgMouseOptErrorDupText = 'This entry conflicts with an existing entry';
+  dlgMouseOptDescAction = 'Action';
+  dlgMouseOptDescButton = 'Click';
   dlgUseDividerDraw = 'Divider drawing';
   dlgCopyWordAtCursorOnCopyNone = 'Copy word on copy none';
   dlgHomeKeyJumpsToNearestStart = 'Home key jumps to nearest start';
diff --git a/ide/frames/editor_mouseaction_options_dlg.lfm b/ide/mouseactiondialog.lfm
similarity index 99%
rename from ide/frames/editor_mouseaction_options_dlg.lfm
rename to ide/mouseactiondialog.lfm
index 810d8ea0e5..2c2648d877 100644
--- a/ide/frames/editor_mouseaction_options_dlg.lfm
+++ b/ide/mouseactiondialog.lfm
@@ -1,7 +1,7 @@
 object EditorMouseOptionsChangeDialog: TEditorMouseOptionsChangeDialog
-  Left = 647
+  Left = 283
   Height = 185
-  Top = 463
+  Top = 237
   Width = 362
   AutoSize = True
   BorderIcons = [biSystemMenu]
diff --git a/ide/frames/editor_mouseaction_options_dlg.lrs b/ide/mouseactiondialog.lrs
similarity index 98%
rename from ide/frames/editor_mouseaction_options_dlg.lrs
rename to ide/mouseactiondialog.lrs
index f1fea113d6..1ee349a77d 100644
--- a/ide/frames/editor_mouseaction_options_dlg.lrs
+++ b/ide/mouseactiondialog.lrs
@@ -2,7 +2,7 @@
 
 LazarusResources.Add('TEditorMouseOptionsChangeDialog','FORMDATA',[
   'TPF0'#31'TEditorMouseOptionsChangeDialog'#30'EditorMouseOptionsChangeDialog'
-  +#4'Left'#3#135#2#6'Height'#3#185#0#3'Top'#3#207#1#5'Width'#3'j'#1#8'AutoSize'
+  +#4'Left'#3#27#1#6'Height'#3#185#0#3'Top'#3#237#0#5'Width'#3'j'#1#8'AutoSize'
   +#9#11'BorderIcons'#11#12'biSystemMenu'#0#11'BorderStyle'#7#8'bsDialog'#7'Cap'
   +'tion'#6#30'EditorMouseOptionsChangeDialog'#12'ClientHeight'#3#185#0#11'Clie'
   +'ntWidth'#3'j'#1#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poScreenCente'
diff --git a/ide/frames/editor_mouseaction_options_dlg.pas b/ide/mouseactiondialog.pas
similarity index 88%
rename from ide/frames/editor_mouseaction_options_dlg.pas
rename to ide/mouseactiondialog.pas
index 63d7ad92c2..c2557c4fc1 100644
--- a/ide/frames/editor_mouseaction_options_dlg.pas
+++ b/ide/mouseactiondialog.pas
@@ -1,4 +1,4 @@
-unit editor_mouseaction_options_dlg;
+unit MouseActionDialog;
 
 {$mode objfpc}{$H+}
 
@@ -20,7 +20,7 @@ type
 
   { TEditorMouseOptionsChangeDialog }
 
-  TEditorMouseOptionsChangeDialog = class(TForm)
+  TMouseaActionDialog = class(TForm)
     ActionBox: TComboBox;
     ActionLabel: TLabel;
     AltCheck: TCheckBox;
@@ -53,9 +53,9 @@ const
   IndexToBtn: array [0..2] of TMouseButton = (mbLeft, mbRight, mbMiddle);
   IndexToClick: array [0..3] of TSynMAClickCount = (ccSingle, ccDouble, ccTriple, ccQuad);
 
-{ TEditorMouseOptionsChangeDialog }
+{ TMouseaActionDialog }
 
-procedure TEditorMouseOptionsChangeDialog.FormCreate(Sender: TObject);
+procedure TMouseaActionDialog.FormCreate(Sender: TObject);
 var
   i: Integer;
   CName: String;
@@ -81,9 +81,12 @@ begin
   ShiftCheck.Caption := dlgMouseOptModShift;
   AltCheck.Caption   := dlgMouseOptModAlt;
   CtrlCheck.Caption  := dlgMouseOptModCtrl;
+  ActionLabel.Caption := dlgMouseOptDescAction;
+  BtnLabel.Caption := dlgMouseOptDescButton;
+  BtnDefault.Caption :=  dlgMouseOptBtnModDef
 end;
 
-procedure TEditorMouseOptionsChangeDialog.ResetInputs;
+procedure TMouseaActionDialog.ResetInputs;
 begin
   ActionBox.ItemIndex := 0;
   ButtonBox.ItemIndex := 0;
@@ -94,14 +97,14 @@ begin
   CtrlCheck.State := cbGrayed;
 end;
 
-procedure TEditorMouseOptionsChangeDialog.BtnDefaultClick(Sender: TObject);
+procedure TMouseaActionDialog.BtnDefaultClick(Sender: TObject);
 begin
   ShiftCheck.State := cbGrayed;
   AltCheck.State := cbGrayed;
   CtrlCheck.State := cbGrayed;
 end;
 
-procedure TEditorMouseOptionsChangeDialog.CapturePanelMouseDown(Sender: TObject;
+procedure TMouseaActionDialog.CapturePanelMouseDown(Sender: TObject;
   Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 begin
   ButtonBox.ItemIndex := BtnToIndex[Button];
@@ -114,7 +117,7 @@ begin
   CtrlCheck.Checked  := ssCtrl in Shift ;
 end;
 
-procedure TEditorMouseOptionsChangeDialog.ReadFromAction(MAct: TSynEditMouseAction);
+procedure TMouseaActionDialog.ReadFromAction(MAct: TSynEditMouseAction);
 begin
   ActionBox.ItemIndex := ActionBox.Items.IndexOfObject(TObject(Pointer(PtrUInt(MAct.Command))));
   ButtonBox.ItemIndex := BtnToIndex[MAct.Button];
@@ -129,7 +132,7 @@ begin
   if not(ssCtrl in MAct.ShiftMask) then CtrlCheck.State := cbGrayed;
 end;
 
-procedure TEditorMouseOptionsChangeDialog.WriteToAction(MAct: TSynEditMouseAction);
+procedure TMouseaActionDialog.WriteToAction(MAct: TSynEditMouseAction);
 begin
   MAct.Command := TSynEditorMouseCommand(PtrUInt(Pointer(ActionBox.items.Objects[ActionBox.ItemIndex])));
   MAct.Button := IndexToBtn[ButtonBox.ItemIndex];
@@ -149,7 +152,7 @@ begin
 end;
 
 initialization
-  {$I editor_mouseaction_options_dlg.lrs}
+  {$I mouseactiondialog.lrs}
 
 end.