diff --git a/ide/runparamsopts.lfm b/ide/runparamsopts.lfm
index c508b8f014..1d58b06a5c 100644
--- a/ide/runparamsopts.lfm
+++ b/ide/runparamsopts.lfm
@@ -256,13 +256,16 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
         TabOrder = 0
       end
       object UserOverridesGroupBox: TGroupBox
+        AnchorSideLeft.Control = EnvVarsPage
         AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Control = EnvVarsPage
+        AnchorSideRight.Side = asrBottom
+        AnchorSideBottom.Control = IncludeSystemVariablesCheckBox
         Left = 6
         Height = 161
         Top = 229
         Width = 484
-        Align = alBottom
-        Anchors = [akTop, akLeft, akRight]
+        Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
         Caption = 'UserOverridesGroupBox'
         ClientHeight = 142
@@ -335,11 +338,13 @@ object RunParamsOptsDlg: TRunParamsOptsDlg
         end
       end
       object SystemVariablesGroupBox: TGroupBox
+        AnchorSideBottom.Control = UserOverridesGroupBox
         Left = 6
         Height = 217
         Top = 6
         Width = 484
-        Align = alClient
+        Align = alTop
+        Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
         Caption = 'SystemVariablesGroupBox'
         ClientHeight = 198
diff --git a/ide/runparamsopts.lrs b/ide/runparamsopts.lrs
index f4d22b6f4d..ae515209ba 100644
--- a/ide/runparamsopts.lrs
+++ b/ide/runparamsopts.lrs
@@ -85,38 +85,41 @@ LazarusResources.Add('TRunParamsOptsDlg','FORMDATA',[
   +'deSystemVariablesCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#140#1#5'Widt'
   +'h'#3#228#1#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6
   +#30'IncludeSystemVariablesCheckBox'#7'Enabled'#8#8'TabOrder'#2#0#0#0#9'TGrou'
-  +'pBox'#21'UserOverridesGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Lef'
-  +'t'#2#6#6'Height'#3#161#0#3'Top'#3#229#0#5'Width'#3#228#1#5'Align'#7#8'alBot'
-  +'tom'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'
-  +#2#6#7'Caption'#6#21'UserOverridesGroupBox'#12'ClientHeight'#3#142#0#11'Clie'
-  +'ntWidth'#3#224#1#8'TabOrder'#2#1#0#7'TButton'#22'UserOverridesAddButton'#4
-  +'Left'#2#6#6'Height'#2#29#3'Top'#2'h'#5'Width'#3#171#0#7'Anchors'#11#6'akLef'
-  +'t'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#22
-  +'UserOverridesAddButton'#7'OnClick'#7#27'UserOverridesAddButtonClick'#8'TabO'
-  +'rder'#2#0#0#0#7'TButton'#23'UserOverridesEditButton'#22'AnchorSideLeft.Cont'
-  +'rol'#7#22'UserOverridesAddButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4
-  +'Left'#3#183#0#6'Height'#2#29#3'Top'#2'h'#5'Width'#3#170#0#7'Anchors'#11#6'a'
-  +'kLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6
-  +#23'UserOverridesEditButton'#7'OnClick'#7#28'UserOverridesEditButtonClick'#8
-  +'TabOrder'#2#1#0#0#7'TButton'#25'UserOverridesDeleteButton'#22'AnchorSideLef'
-  +'t.Control'#7#23'UserOverridesEditButton'#19'AnchorSideLeft.Side'#7#9'asrBot'
-  +'tom'#4'Left'#3'g'#1#6'Height'#2#29#3'Top'#2'h'#5'Width'#3#188#0#7'Anchors'
-  +#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Cap'
-  +'tion'#6#25'UserOverridesDeleteButton'#7'OnClick'#7#30'UserOverridesDeleteBu'
-  +'ttonClick'#8'TabOrder'#2#2#0#0#9'TListView'#21'UserOverridesListView'#24'An'
-  +'chorSideBottom.Control'#7#22'UserOverridesAddButton'#4'Left'#2#6#6'Height'#2
-  +'\'#3'Top'#2#6#5'Width'#3#212#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Columns'#14
-  +#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#2';'#0#1#8'AutoSize'#9#7'C'
-  +'aption'#6#7'Caption'#5'Width'#3#135#1#0#0#9'RowSelect'#9#8'SortType'#7#6'st'
-  +'Text'#8'TabOrder'#2#3#9'ViewStyle'#7#8'vsReport'#0#0#0#9'TGroupBox'#23'Syst'
-  +'emVariablesGroupBox'#4'Left'#2#6#6'Height'#3#217#0#3'Top'#2#6#5'Width'#3#228
-  +#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'Syste'
-  +'mVariablesGroupBox'#12'ClientHeight'#3#198#0#11'ClientWidth'#3#224#1#8'TabO'
-  +'rder'#2#2#0#9'TListView'#23'SystemVariablesListView'#4'Left'#2#6#6'Height'#3
-  +#186#0#3'Top'#2#6#5'Width'#3#212#1#5'Align'#7#8'alClient'#20'BorderSpacing.A'
-  +'round'#2#6#7'Columns'#14#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#2
-  +';'#0#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#3#135#1#0#0#9'RowSele'
-  +'ct'#9#8'SortType'#7#6'stText'#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#0#0
-  +#0#0#0#0
+  +'pBox'#21'UserOverridesGroupBox'#22'AnchorSideLeft.Control'#7#11'EnvVarsPage'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#11'EnvV'
+  +'arsPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Contro'
+  +'l'#7#30'IncludeSystemVariablesCheckBox'#4'Left'#2#6#6'Height'#3#161#0#3'Top'
+  +#3#229#0#5'Width'#3#228#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBo'
+  +'ttom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'UserOverridesGroupBox'
+  +#12'ClientHeight'#3#142#0#11'ClientWidth'#3#224#1#8'TabOrder'#2#1#0#7'TButto'
+  +'n'#22'UserOverridesAddButton'#4'Left'#2#6#6'Height'#2#29#3'Top'#2'h'#5'Widt'
+  +'h'#3#171#0#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpa'
+  +'cing.Around'#2#6#7'Caption'#6#22'UserOverridesAddButton'#7'OnClick'#7#27'Us'
+  +'erOverridesAddButtonClick'#8'TabOrder'#2#0#0#0#7'TButton'#23'UserOverridesE'
+  +'ditButton'#22'AnchorSideLeft.Control'#7#22'UserOverridesAddButton'#19'Ancho'
+  +'rSideLeft.Side'#7#9'asrBottom'#4'Left'#3#183#0#6'Height'#2#29#3'Top'#2'h'#5
+  +'Width'#3#170#0#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'Borde'
+  +'rSpacing.Around'#2#6#7'Caption'#6#23'UserOverridesEditButton'#7'OnClick'#7
+  +#28'UserOverridesEditButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#25'UserOver'
+  +'ridesDeleteButton'#22'AnchorSideLeft.Control'#7#23'UserOverridesEditButton'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3'g'#1#6'Height'#2#29#3'Top'
+  +#2'h'#5'Width'#3#188#0#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#25'UserOverridesDeleteButton'#7'OnCl'
+  +'ick'#7#30'UserOverridesDeleteButtonClick'#8'TabOrder'#2#2#0#0#9'TListView'
+  +#21'UserOverridesListView'#24'AnchorSideBottom.Control'#7#22'UserOverridesAd'
+  +'dButton'#4'Left'#2#6#6'Height'#2'\'#3'Top'#2#6#5'Width'#3#212#1#5'Align'#7#5
+  +'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderS'
+  +'pacing.Around'#2#6#7'Columns'#14#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5
+  +'Width'#2';'#0#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#3#135#1#0#0#9
+  +'RowSelect'#9#8'SortType'#7#6'stText'#8'TabOrder'#2#3#9'ViewStyle'#7#8'vsRep'
+  +'ort'#0#0#0#9'TGroupBox'#23'SystemVariablesGroupBox'#24'AnchorSideBottom.Con'
+  +'trol'#7#21'UserOverridesGroupBox'#4'Left'#2#6#6'Height'#3#217#0#3'Top'#2#6#5
+  +'Width'#3#228#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRig'
+  +'ht'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'SystemVariab'
+  +'lesGroupBox'#12'ClientHeight'#3#198#0#11'ClientWidth'#3#224#1#8'TabOrder'#2
+  +#2#0#9'TListView'#23'SystemVariablesListView'#4'Left'#2#6#6'Height'#3#186#0#3
+  +'Top'#2#6#5'Width'#3#212#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2
+  +#6#7'Columns'#14#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#2';'#0#1#8
+  +'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#3#135#1#0#0#9'RowSelect'#9#8'S'
+  +'ortType'#7#6'stText'#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#0#0#0#0#0#0
 ]);