diff --git a/ide/mouseactiondialog.lfm b/ide/mouseactiondialog.lfm
index a1b5fbf68c..542173d7a8 100644
--- a/ide/mouseactiondialog.lfm
+++ b/ide/mouseactiondialog.lfm
@@ -1,25 +1,24 @@
 object MouseaActionDialog: TMouseaActionDialog
-  Left = 414
-  Height = 400
+  Left = 412
+  Height = 449
   Top = 225
-  Width = 620
+  Width = 627
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
   Caption = 'MouseaActionDialog'
-  ClientHeight = 400
-  ClientWidth = 620
+  ClientHeight = 449
+  ClientWidth = 627
   OnCreate = FormCreate
   Position = poScreenCenter
   LCLVersion = '1.5'
   object BtnLabel: TLabel
     AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = Panel1
     AnchorSideRight.Control = ActionLabel
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 15
-    Top = 134
-    Width = 63
+    Height = 17
+    Top = 159
+    Width = 90
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 6
     Caption = 'BtnLabel'
@@ -30,11 +29,12 @@ object MouseaActionDialog: TMouseaActionDialog
     AnchorSideTop.Control = ActionBox
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 15
-    Top = 10
-    Width = 63
+    Height = 17
+    Top = 13
+    Width = 90
     BorderSpacing.Left = 6
     Caption = 'ActionLabel'
+    Constraints.MinWidth = 90
     ParentColor = False
   end
   object OptLabel: TLabel
@@ -43,10 +43,10 @@ object MouseaActionDialog: TMouseaActionDialog
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 75
+    Left = 102
     Height = 16
-    Top = 60
-    Width = 539
+    Top = 73
+    Width = 519
     Anchors = [akTop, akLeft, akRight]
     AutoSize = False
     BorderSpacing.Top = 6
@@ -59,37 +59,38 @@ object MouseaActionDialog: TMouseaActionDialog
     AnchorSideTop.Control = PriorSpin
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 15
-    Top = 109
-    Width = 53
+    Height = 17
+    Top = 131
+    Width = 71
     BorderSpacing.Left = 6
     Caption = 'PriorLabel'
     ParentColor = False
   end
   object CapturePanel: TPanel
     AnchorSideLeft.Control = chkUpRestrict
-    AnchorSideTop.Control = BtnDefault
+    AnchorSideTop.Control = chkUpRestrict
+    AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = chkUpRestrict
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = ButtonPanel1
-    Left = 181
-    Height = 62
-    Top = 292
-    Width = 433
+    Left = 255
+    Height = 65
+    Top = 335
+    Width = 368
     Anchors = [akTop, akLeft, akRight, akBottom]
     BevelOuter = bvLowered
     BevelWidth = 2
-    ClientHeight = 62
-    ClientWidth = 433
+    ClientHeight = 65
+    ClientWidth = 368
     Color = clBtnShadow
     ParentColor = False
-    TabOrder = 11
+    TabOrder = 13
     OnMouseDown = CapturePanelMouseDown
     object PaintBox1: TPaintBox
       Left = 2
-      Height = 58
+      Height = 61
       Top = 2
-      Width = 429
+      Width = 364
       Align = alClient
       Anchors = [akTop, akRight, akBottom]
       OnMouseDown = CapturePanelMouseDown
@@ -97,43 +98,40 @@ object MouseaActionDialog: TMouseaActionDialog
     end
   end
   object ShiftCheck: TCheckBox
-    AnchorSideLeft.Control = Panel1
-    AnchorSideTop.Control = Panel1
+    AnchorSideLeft.Control = DirCheck
+    AnchorSideTop.Control = DirCheck
     AnchorSideTop.Side = asrBottom
-    Left = 75
-    Height = 19
-    Top = 217
-    Width = 77
+    Left = 102
+    Height = 24
+    Top = 257
+    Width = 98
     AllowGrayed = True
-    BorderSpacing.Top = 6
     Caption = 'ShiftCheck'
-    TabOrder = 6
+    TabOrder = 8
   end
   object AltCheck: TCheckBox
     AnchorSideLeft.Control = ShiftCheck
     AnchorSideTop.Control = ShiftCheck
     AnchorSideTop.Side = asrBottom
-    Left = 75
-    Height = 19
-    Top = 242
-    Width = 68
+    Left = 102
+    Height = 24
+    Top = 281
+    Width = 86
     AllowGrayed = True
-    BorderSpacing.Top = 6
     Caption = 'AltCheck'
-    TabOrder = 7
+    TabOrder = 9
   end
   object CtrlCheck: TCheckBox
     AnchorSideLeft.Control = AltCheck
     AnchorSideTop.Control = AltCheck
     AnchorSideTop.Side = asrBottom
-    Left = 75
-    Height = 19
-    Top = 267
-    Width = 72
+    Left = 102
+    Height = 24
+    Top = 305
+    Width = 91
     AllowGrayed = True
-    BorderSpacing.Top = 6
     Caption = 'CtrlCheck'
-    TabOrder = 8
+    TabOrder = 10
   end
   object BtnDefault: TButton
     AnchorSideLeft.Control = CtrlCheck
@@ -142,24 +140,24 @@ object MouseaActionDialog: TMouseaActionDialog
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Side = asrBottom
-    Left = 75
-    Height = 25
-    Top = 292
-    Width = 82
+    Left = 102
+    Height = 29
+    Top = 335
+    Width = 85
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'BtnDefault'
     OnClick = BtnDefaultClick
-    TabOrder = 9
+    TabOrder = 11
   end
   object CaretCheck: TCheckBox
     AnchorSideLeft.Control = ActionBox
     AnchorSideTop.Control = ActionBox
     AnchorSideTop.Side = asrBottom
-    Left = 75
-    Height = 19
-    Top = 35
-    Width = 81
+    Left = 102
+    Height = 24
+    Top = 43
+    Width = 103
     BorderSpacing.Top = 6
     Caption = 'CaretCheck'
     TabOrder = 1
@@ -170,15 +168,13 @@ object MouseaActionDialog: TMouseaActionDialog
     AnchorSideTop.Control = Owner
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 75
-    Height = 23
+    Left = 102
+    Height = 31
     Top = 6
-    Width = 539
+    Width = 519
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Left = 6
-    BorderSpacing.Top = 6
-    BorderSpacing.Right = 6
-    ItemHeight = 15
+    BorderSpacing.Around = 6
+    ItemHeight = 0
     OnChange = ActionBoxChange
     Style = csDropDownList
     TabOrder = 0
@@ -189,9 +185,9 @@ object MouseaActionDialog: TMouseaActionDialog
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 34
-    Top = 360
-    Width = 608
+    Height = 37
+    Top = 406
+    Width = 615
     OKButton.Name = 'OKButton'
     OKButton.DefaultCaption = True
     HelpButton.Name = 'HelpButton'
@@ -200,7 +196,7 @@ object MouseaActionDialog: TMouseaActionDialog
     CloseButton.DefaultCaption = True
     CancelButton.Name = 'CancelButton'
     CancelButton.DefaultCaption = True
-    TabOrder = 12
+    TabOrder = 14
     ShowButtons = [pbOK, pbCancel]
   end
   object OptBox: TComboBox
@@ -209,14 +205,14 @@ object MouseaActionDialog: TMouseaActionDialog
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 75
-    Height = 23
-    Top = 76
-    Width = 539
+    Left = 102
+    Height = 31
+    Top = 89
+    Width = 519
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Right = 6
     Enabled = False
-    ItemHeight = 15
+    ItemHeight = 0
     Style = csDropDownList
     TabOrder = 2
   end
@@ -224,9 +220,9 @@ object MouseaActionDialog: TMouseaActionDialog
     AnchorSideLeft.Control = OptLabel
     AnchorSideTop.Control = OptBox
     AnchorSideTop.Side = asrBottom
-    Left = 75
-    Height = 23
-    Top = 105
+    Left = 102
+    Height = 27
+    Top = 126
     Width = 60
     BorderSpacing.Top = 6
     MaxValue = 3
@@ -238,9 +234,9 @@ object MouseaActionDialog: TMouseaActionDialog
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 554
-    Height = 23
-    Top = 105
+    Left = 561
+    Height = 27
+    Top = 126
     Width = 60
     Anchors = [akTop, akRight]
     BorderSpacing.Top = 6
@@ -253,80 +249,71 @@ object MouseaActionDialog: TMouseaActionDialog
     AnchorSideTop.Control = Opt2Spin
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Opt2Spin
-    Left = 494
-    Height = 15
-    Top = 109
-    Width = 54
+    Left = 484
+    Height = 17
+    Top = 131
+    Width = 71
     Anchors = [akTop, akRight]
     BorderSpacing.Left = 6
     BorderSpacing.Right = 6
     Caption = 'Opt2Label'
     ParentColor = False
   end
-  object Panel1: TPanel
-    AnchorSideLeft.Control = PriorSpin
-    AnchorSideTop.Control = PriorSpin
-    AnchorSideTop.Side = asrBottom
-    Left = 75
-    Height = 77
-    Top = 134
-    Width = 100
-    AutoSize = True
-    BorderSpacing.Top = 6
-    BevelOuter = bvNone
-    ClientHeight = 77
-    ClientWidth = 100
-    TabOrder = 5
-    object DirCheck: TCheckBox
-      AnchorSideTop.Control = ClickBox
-      AnchorSideTop.Side = asrBottom
-      Left = 0
-      Height = 19
-      Top = 58
-      Width = 68
-      BorderSpacing.Top = 6
-      Caption = 'DirCheck'
-      OnChange = DirCheckChange
-      TabOrder = 2
-    end
-    object ClickBox: TComboBox
-      AnchorSideTop.Control = ButtonBox
-      AnchorSideTop.Side = asrBottom
-      Left = 0
-      Height = 23
-      Top = 29
-      Width = 100
-      BorderSpacing.Top = 6
-      ItemHeight = 15
-      Style = csDropDownList
-      TabOrder = 1
-    end
-    object ButtonBox: TComboBox
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Side = asrBottom
-      Left = 0
-      Height = 23
-      Top = 0
-      Width = 100
-      ItemHeight = 15
-      OnChange = ButtonBoxChange
-      Style = csDropDownList
-      TabOrder = 0
-    end
-  end
   object chkUpRestrict: TCheckListBox
-    AnchorSideLeft.Control = Panel1
+    AnchorSideLeft.Control = ButtonBox
     AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = Panel1
     AnchorSideBottom.Control = BtnDefault
-    Left = 181
-    Height = 152
-    Top = 134
-    Width = 433
-    Anchors = [akTop, akLeft, akRight, akBottom]
-    BorderSpacing.Left = 6
-    BorderSpacing.Right = 6
+    Left = 255
+    Height = 170
+    Top = 159
+    Width = 368
+    Anchors = [akTop, akRight, akBottom]
+    BorderSpacing.Around = 6
     ItemHeight = 0
-    TabOrder = 10
+    TabOrder = 12
+    TopIndex = -1
+  end
+  object ButtonBox: TComboBox
+    AnchorSideLeft.Control = PriorSpin
+    AnchorSideTop.Control = chkUpRestrict
+    AnchorSideRight.Control = chkUpRestrict
+    Left = 102
+    Height = 31
+    Top = 159
+    Width = 147
+    Anchors = [akTop, akLeft, akRight]
+    ItemHeight = 0
+    OnChange = ButtonBoxChange
+    Style = csDropDownList
+    TabOrder = 5
+  end
+  object ClickBox: TComboBox
+    AnchorSideLeft.Control = ButtonBox
+    AnchorSideTop.Control = ButtonBox
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = ButtonBox
+    AnchorSideRight.Side = asrBottom
+    Left = 102
+    Height = 31
+    Top = 196
+    Width = 147
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Top = 6
+    ItemHeight = 0
+    Style = csDropDownList
+    TabOrder = 6
+  end
+  object DirCheck: TCheckBox
+    AnchorSideLeft.Control = ButtonBox
+    AnchorSideTop.Control = ClickBox
+    AnchorSideTop.Side = asrBottom
+    Left = 102
+    Height = 24
+    Top = 233
+    Width = 86
+    BorderSpacing.Top = 6
+    Caption = 'DirCheck'
+    OnChange = DirCheckChange
+    TabOrder = 7
   end
 end
diff --git a/ide/mouseactiondialog.pas b/ide/mouseactiondialog.pas
index e6be0899da..7bc2b77cdc 100644
--- a/ide/mouseactiondialog.pas
+++ b/ide/mouseactiondialog.pas
@@ -28,12 +28,11 @@ type
     CaretCheck: TCheckBox;
     chkUpRestrict: TCheckListBox;
     ClickBox: TComboBox;
+    DirCheck: TCheckBox;
     PaintBox1: TPaintBox;
-    Panel1: TPanel;
     PriorLabel: TLabel;
     OptBox: TComboBox;
     CtrlCheck: TCheckBox;
-    DirCheck: TCheckBox;
     CapturePanel: TPanel;
     OptLabel: TLabel;
     Opt2Spin: TSpinEdit;