diff --git a/ide/editormacrolistviewer.lfm b/ide/editormacrolistviewer.lfm
index afd76c321d..9f6e76fb6b 100644
--- a/ide/editormacrolistviewer.lfm
+++ b/ide/editormacrolistviewer.lfm
@@ -1,10 +1,10 @@
 object MacroListView: TMacroListView
   Left = 390
-  Height = 365
+  Height = 387
   Top = 249
   Width = 424
   Caption = 'MacroListView'
-  ClientHeight = 365
+  ClientHeight = 387
   ClientWidth = 424
   Constraints.MinHeight = 365
   Constraints.MinWidth = 300
@@ -14,7 +14,7 @@ object MacroListView: TMacroListView
   object Panel1: TPanel
     AnchorSideRight.Control = pnlButtons
     Left = 6
-    Height = 313
+    Height = 335
     Top = 6
     Width = 295
     Align = alLeft
@@ -23,12 +23,12 @@ object MacroListView: TMacroListView
     BorderSpacing.Top = 6
     BorderSpacing.Right = 6
     BevelOuter = bvNone
-    ClientHeight = 313
+    ClientHeight = 335
     ClientWidth = 295
     TabOrder = 0
     object lbMacroView: TListView
       Left = 0
-      Height = 266
+      Height = 288
       Top = 22
       Width = 295
       Align = alClient
@@ -103,7 +103,7 @@ object MacroListView: TMacroListView
     object ToolBar2: TToolBar
       Left = 0
       Height = 22
-      Top = 291
+      Top = 313
       Width = 295
       Align = alBottom
       AutoSize = True
@@ -139,7 +139,7 @@ object MacroListView: TMacroListView
   object ButtonPanel1: TButtonPanel
     Left = 6
     Height = 34
-    Top = 325
+    Top = 347
     Width = 412
     OKButton.Name = 'OKButton'
     OKButton.DefaultCaption = True
@@ -155,13 +155,13 @@ object MacroListView: TMacroListView
   end
   object pnlButtons: TPanel
     Left = 307
-    Height = 319
+    Height = 341
     Top = 0
     Width = 117
     Align = alRight
     AutoSize = True
     BevelOuter = bvNone
-    ClientHeight = 319
+    ClientHeight = 341
     ClientWidth = 117
     Constraints.MinHeight = 250
     TabOrder = 1
@@ -209,10 +209,10 @@ object MacroListView: TMacroListView
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = pnlButtons
       AnchorSideRight.Side = asrBottom
-      AnchorSideBottom.Control = chkRepeat
+      AnchorSideBottom.Control = PanelRepeat
       Left = 6
       Height = 25
-      Top = 180
+      Top = 200
       Width = 105
       Anchors = [akLeft, akRight, akBottom]
       AutoSize = True
@@ -232,7 +232,7 @@ object MacroListView: TMacroListView
       AnchorSideBottom.Control = btnRecordStop
       Left = 6
       Height = 25
-      Top = 263
+      Top = 285
       Width = 105
       Anchors = [akLeft, akRight, akBottom]
       AutoSize = True
@@ -241,7 +241,7 @@ object MacroListView: TMacroListView
       BorderSpacing.Bottom = 6
       Caption = 'btnRecord'
       OnClick = btnRecordClick
-      TabOrder = 8
+      TabOrder = 6
     end
     object btnRecordStop: TButton
       AnchorSideLeft.Control = pnlButtons
@@ -253,7 +253,7 @@ object MacroListView: TMacroListView
       AnchorSideBottom.Side = asrBottom
       Left = 6
       Height = 25
-      Top = 294
+      Top = 316
       Width = 105
       Anchors = [akLeft, akRight, akBottom]
       AutoSize = True
@@ -261,47 +261,7 @@ object MacroListView: TMacroListView
       BorderSpacing.Right = 6
       Caption = 'btnRecordStop'
       OnClick = btnRecordStopClick
-      TabOrder = 9
-    end
-    object chkRepeat: TCheckBox
-      AnchorSideLeft.Control = pnlButtons
-      AnchorSideTop.Control = btnPlay
-      AnchorSideTop.Side = asrBottom
-      AnchorSideRight.Control = pnlButtons
-      AnchorSideRight.Side = asrBottom
-      AnchorSideBottom.Control = edRepeat
-      Left = 6
-      Height = 19
-      Top = 208
-      Width = 105
-      Anchors = [akLeft, akRight, akBottom]
-      BorderSpacing.Left = 6
-      BorderSpacing.Top = 3
-      BorderSpacing.Right = 6
-      BorderSpacing.Bottom = 3
-      Caption = 'chkRepeat'
-      TabOrder = 6
-    end
-    object edRepeat: TSpinEdit
-      AnchorSideLeft.Control = pnlButtons
-      AnchorSideTop.Control = chkRepeat
-      AnchorSideTop.Side = asrBottom
-      AnchorSideRight.Control = pnlButtons
-      AnchorSideRight.Side = asrBottom
-      AnchorSideBottom.Control = btnRecord
-      Left = 6
-      Height = 23
-      Top = 230
-      Width = 105
-      Anchors = [akLeft, akRight, akBottom]
-      BorderSpacing.Left = 6
-      BorderSpacing.Top = 3
-      BorderSpacing.Right = 6
-      BorderSpacing.Bottom = 10
-      MaxValue = 999
-      MinValue = 1
       TabOrder = 7
-      Value = 1
     end
     object btnDelete: TButton
       AnchorSideLeft.Control = pnlButtons
@@ -363,6 +323,66 @@ object MacroListView: TMacroListView
       OnClick = btnEditClick
       TabOrder = 3
     end
+    object PanelRepeat: TPanel
+      AnchorSideLeft.Control = pnlButtons
+      AnchorSideTop.Control = btnPlay
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = pnlButtons
+      AnchorSideRight.Side = asrBottom
+      AnchorSideBottom.Control = btnRecord
+      Left = 6
+      Height = 54
+      Top = 228
+      Width = 105
+      Anchors = [akLeft, akRight, akBottom]
+      AutoSize = True
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 3
+      BorderSpacing.Right = 6
+      BorderSpacing.Bottom = 3
+      BevelOuter = bvNone
+      BorderStyle = bsSingle
+      ClientHeight = 50
+      ClientWidth = 101
+      TabOrder = 8
+      object edRepeat: TSpinEdit
+        AnchorSideLeft.Control = PanelRepeat
+        AnchorSideTop.Control = chkRepeat
+        AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Control = PanelRepeat
+        AnchorSideRight.Side = asrBottom
+        Left = 3
+        Height = 23
+        Top = 24
+        Width = 95
+        Anchors = [akTop, akLeft, akRight]
+        BorderSpacing.Left = 3
+        BorderSpacing.Top = 3
+        BorderSpacing.Right = 3
+        BorderSpacing.Bottom = 3
+        MaxValue = 999
+        MinValue = 1
+        TabOrder = 0
+        Value = 1
+      end
+      object chkRepeat: TCheckBox
+        AnchorSideLeft.Control = PanelRepeat
+        AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Control = PanelRepeat
+        AnchorSideRight.Side = asrBottom
+        AnchorSideBottom.Control = edRepeat
+        Left = 3
+        Height = 19
+        Top = 2
+        Width = 95
+        Anchors = [akLeft, akRight]
+        BorderSpacing.Left = 3
+        BorderSpacing.Right = 3
+        BorderSpacing.Bottom = 3
+        Caption = 'chkRepeat'
+        TabOrder = 1
+      end
+    end
   end
   object PopupMenu1: TPopupMenu
     left = 144
diff --git a/ide/editormacrolistviewer.pas b/ide/editormacrolistviewer.pas
index 40b1de515d..b782de5507 100644
--- a/ide/editormacrolistviewer.pas
+++ b/ide/editormacrolistviewer.pas
@@ -175,12 +175,14 @@ type
     btnRename: TButton;
     ButtonPanel1: TButtonPanel;
     chkRepeat: TCheckBox;
+    GroupBox1: TGroupBox;
     lbMoveTo: TLabel;
     lbMacroView: TListView;
     mnExport: TMenuItem;
     mnImport: TMenuItem;
     OpenDialog1: TOpenDialog;
     Panel1: TPanel;
+    PanelRepeat: TPanel;
     pnlButtons: TPanel;
     PopupMenu1: TPopupMenu;
     RenameButton: TPanelBitBtn;
@@ -1075,7 +1077,7 @@ begin
   if se = nil then Exit;
 
   i := 1;
-  if chkRepeat.Enabled then i := edRepeat.Value;
+  if chkRepeat.Checked then i := edRepeat.Value;
   FIsPlaying := True;
   UpdateButtons;