diff --git a/ide/frames/editor_multiwindow_options.lfm b/ide/frames/editor_multiwindow_options.lfm
index a86afa48ca..380e7697e1 100644
--- a/ide/frames/editor_multiwindow_options.lfm
+++ b/ide/frames/editor_multiwindow_options.lfm
@@ -2,8 +2,11 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
   Height = 415
   Width = 521
   Anchors = [akTop]
+  ChildSizing.Layout = cclTopToBottomThenLeftToRight
+  ChildSizing.ControlsPerLine = 2
   ClientHeight = 415
   ClientWidth = 521
+  TabOrder = 0
   Visible = False
   DesignLeft = 929
   DesignTop = 308
@@ -16,15 +19,15 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 6
-    Height = 214
-    Top = 201
+    Height = 232
+    Top = 183
     Width = 509
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     BorderSpacing.Right = 6
     BevelOuter = bvNone
-    ClientHeight = 214
+    ClientHeight = 232
     ClientWidth = 509
     TabOrder = 0
     object listAccessType: TCheckListBox
@@ -46,18 +49,18 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
     end
     object Panel2: TPanel
       Left = 0
-      Height = 50
+      Height = 67
       Top = 165
       Width = 509
       Align = alClient
       BevelOuter = bvNone
-      ClientHeight = 50
+      ClientHeight = 67
       ClientWidth = 509
       Constraints.MinHeight = 50
       TabOrder = 1
       object lblAccessTypeDesc: TLabel
         Left = 0
-        Height = 16
+        Height = 14
         Top = 0
         Width = 509
         Align = alTop
@@ -84,7 +87,7 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 0
     Height = 3
-    Top = 92
+    Top = 83
     Width = 60
     BorderSpacing.Bottom = 6
   end
@@ -94,8 +97,8 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
     AnchorSideTop.Control = pnlNBTabs
     AnchorSideTop.Side = asrBottom
     Left = 70
-    Height = 16
-    Top = 85
+    Height = 14
+    Top = 77
     Width = 167
     BorderSpacing.Left = 10
     BorderSpacing.Bottom = 6
@@ -113,7 +116,7 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 247
     Height = 3
-    Top = 92
+    Top = 83
     Width = 274
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 10
@@ -125,8 +128,8 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 66
-    Top = 107
+    Height = 60
+    Top = 97
     Width = 509
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
@@ -134,12 +137,12 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
     BorderSpacing.Right = 6
     BorderSpacing.Bottom = 6
     BevelOuter = bvNone
-    ClientHeight = 66
+    ClientHeight = 60
     ClientWidth = 509
     TabOrder = 1
     object lblAccessOrder: TLabel
       Left = 0
-      Height = 16
+      Height = 14
       Top = 0
       Width = 509
       Align = alTop
@@ -155,8 +158,8 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
       AnchorSideRight.Control = Panel1
       AnchorSideRight.Side = asrBottom
       Left = 0
-      Height = 19
-      Top = 22
+      Height = 17
+      Top = 20
       Width = 509
       Anchors = [akTop, akLeft, akRight]
       Caption = 'radioAccessOrderEdit'
@@ -172,8 +175,8 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
       AnchorSideRight.Control = Panel1
       AnchorSideRight.Side = asrBottom
       Left = 0
-      Height = 19
-      Top = 41
+      Height = 17
+      Top = 37
       Width = 509
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Bottom = 6
@@ -189,8 +192,8 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 16
-    Top = 179
+    Height = 14
+    Top = 163
     Width = 521
     Anchors = [akTop, akLeft, akRight]
     Caption = 'lblAccessType'
@@ -204,7 +207,7 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 0
     Height = 3
-    Top = 7
+    Top = 6
     Width = 60
     BorderSpacing.Bottom = 6
   end
@@ -213,9 +216,9 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = Owner
     Left = 70
-    Height = 16
+    Height = 14
     Top = 0
-    Width = 127
+    Width = 126
     BorderSpacing.Left = 10
     BorderSpacing.Bottom = 6
     Caption = 'lblMultiWinTabSection'
@@ -230,10 +233,10 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 207
+    Left = 206
     Height = 3
-    Top = 7
-    Width = 314
+    Top = 6
+    Width = 315
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 10
   end
@@ -244,8 +247,8 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 57
-    Top = 22
+    Height = 51
+    Top = 20
     Width = 509
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
@@ -253,26 +256,28 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
     BorderSpacing.Right = 6
     BorderSpacing.Bottom = 6
     BevelOuter = bvNone
-    ChildSizing.EnlargeHorizontal = crsScaleChilds
-    ChildSizing.ShrinkHorizontal = crsScaleChilds
-    ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 2
-    ClientHeight = 57
+    ClientHeight = 51
     ClientWidth = 509
     TabOrder = 2
     object chkShowCloseBtn: TCheckBox
       Left = 0
-      Height = 19
+      Height = 17
       Top = 0
-      Width = 293
+      Width = 102
+      BorderSpacing.CellAlignHorizontal = ccaLeftTop
+      BorderSpacing.CellAlignVertical = ccaLeftTop
       Caption = 'chkShowCloseBtn'
       TabOrder = 0
     end
     object chkShowNumbers: TCheckBox
-      Left = 293
-      Height = 19
+      AnchorSideLeft.Control = CenterLabel
+      Left = 254
+      Height = 17
       Top = 0
-      Width = 216
+      Width = 102
+      BorderSpacing.CellAlignHorizontal = ccaLeftTop
+      BorderSpacing.CellAlignVertical = ccaLeftTop
       Caption = 'chkShowNumbers'
       TabOrder = 1
     end
@@ -280,27 +285,44 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Side = asrBottom
       Left = 0
-      Height = 19
-      Top = 19
-      Width = 293
+      Height = 17
+      Top = 17
+      Width = 101
+      BorderSpacing.CellAlignHorizontal = ccaLeftTop
+      BorderSpacing.CellAlignVertical = ccaLeftTop
       Caption = 'chkHideSingleTab'
       TabOrder = 2
     end
     object chkUseTabHistory: TCheckBox
-      Left = 293
-      Height = 19
-      Top = 19
-      Width = 216
+      AnchorSideLeft.Control = chkShowNumbers
+      Left = 254
+      Height = 17
+      Top = 17
+      Width = 104
+      BorderSpacing.CellAlignHorizontal = ccaLeftTop
+      BorderSpacing.CellAlignVertical = ccaLeftTop
       Caption = 'chkUseTabHistory'
       TabOrder = 3
     end
     object chkCtrlMiddleCloseOthers: TCheckBox
       Left = 0
-      Height = 19
-      Top = 38
-      Width = 293
+      Height = 17
+      Top = 34
+      Width = 140
+      BorderSpacing.CellAlignHorizontal = ccaLeftTop
+      BorderSpacing.CellAlignVertical = ccaLeftTop
       Caption = 'chkCtrlMiddleCloseOthers'
       TabOrder = 4
     end
+    object CenterLabel: TLabel
+      AnchorSideLeft.Control = pnlNBTabs
+      AnchorSideLeft.Side = asrCenter
+      AnchorSideTop.Control = pnlNBTabs
+      Left = 254
+      Height = 1
+      Top = 0
+      Width = 1
+      ParentColor = False
+    end
   end
 end
diff --git a/ide/frames/editor_multiwindow_options.pas b/ide/frames/editor_multiwindow_options.pas
index b02dbcce9d..c492dee2bf 100644
--- a/ide/frames/editor_multiwindow_options.pas
+++ b/ide/frames/editor_multiwindow_options.pas
@@ -37,6 +37,7 @@ type
     Bevel1a: TBevel;
     Bevel2a: TBevel;
     Bevel2: TBevel;
+    CenterLabel: TLabel;
     chkCtrlMiddleCloseOthers: TCheckBox;
     chkUseTabHistory: TCheckBox;
     chkShowCloseBtn: TCheckBox;