diff --git a/ide/frames/compiler_other_options.lfm b/ide/frames/compiler_other_options.lfm
index 5f8cf4d1d6..4ca43403fb 100644
--- a/ide/frames/compiler_other_options.lfm
+++ b/ide/frames/compiler_other_options.lfm
@@ -31,14 +31,14 @@ object CompilerOtherOptionsFrame: TCompilerOtherOptionsFrame
       TabOrder = 0
     end
   end
-  object ConditionalsGroupBox: TGroupBox
+  object grpConditionals: TGroupBox
     Left = 0
     Height = 206
     Top = 240
     Width = 594
     Align = alBottom
     Anchors = [akTop, akLeft, akRight]
-    Caption = 'ConditionalsGroupBox'
+    Caption = 'grpConditionals'
     ClientHeight = 187
     ClientWidth = 590
     TabOrder = 1
@@ -717,13 +717,13 @@ object CompilerOtherOptionsFrame: TCompilerOtherOptionsFrame
     Align = alBottom
     ResizeAnchor = akBottom
   end
-  object AllOptionsGroupBox: TGroupBox
+  object grpAllOptions: TGroupBox
     Left = 0
     Height = 147
     Top = 0
     Width = 594
     Align = alClient
-    Caption = 'AllOptionsGroupBox'
+    Caption = 'grpAllOptions'
     ClientHeight = 128
     ClientWidth = 590
     TabOrder = 4
diff --git a/ide/frames/compiler_other_options.pas b/ide/frames/compiler_other_options.pas
index f848706870..4fc3bc3dc0 100644
--- a/ide/frames/compiler_other_options.pas
+++ b/ide/frames/compiler_other_options.pas
@@ -41,11 +41,11 @@ type
   TCompilerOtherOptionsFrame = class(TAbstractIDEOptionsEditor)
     btnGetAll: TButton;
     ConditionalsSplitter: TSplitter;
-    AllOptionsGroupBox: TGroupBox;
+    grpAllOptions: TGroupBox;
     grpCustomOptions: TGroupBox;
     lblStatus: TLabel;
     memCustomOptions: TMemo;
-    ConditionalsGroupBox: TGroupBox;
+    grpConditionals: TGroupBox;
     CondStatusbar: TStatusBar;
     CondSynEdit: TSynEdit;
     CustomSplitter: TSplitter;
@@ -745,8 +745,6 @@ begin
   fDefaultVariables:=TCTCfgScriptVariables.Create;
   fEngine:=TIDECfgScriptEngine.Create;
 
-  ConditionalsGroupBox.Caption:=lisConditionals;
-
   CondSynEdit.OnStatusChange:=@CondSynEditStatusChange;
 
   fSynCompletion:=TSynCompletion.Create(Self);
@@ -785,8 +783,10 @@ end;
 
 procedure TCompilerOtherOptionsFrame.Setup(ADialog: TAbstractOptionsEditorDialog);
 begin
+  grpAllOptions.Caption := lisAllOptions;
   grpCustomOptions.Caption := lisCustomOptions2;
   memCustomOptions.Hint := lisCustomOptHint;
+  grpConditionals.Caption := lisConditionals;
 end;
 
 procedure TCompilerOtherOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index f1f68d7b20..3fd80c86f8 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -2093,6 +2093,7 @@ resourcestring
   dlgConfigFiles = 'Config files';
   dlgUseFpcCfg = 'Use standard compiler config file (fpc.cfg)';
   dlgUseCustomConfig = 'Use additional compiler config file';
+  lisAllOptions = 'All Options';
   lisCustomOptions2 = 'Custom options';
   lisCustomOptHint = 'These options are passed directly to the compiler. Macros ' +
                      'are replaced, line breaks are replaced with single spaces.';