diff --git a/ide/ideoptionsdlg.lfm b/ide/ideoptionsdlg.lfm
index 7c5317ebbc..283d6336af 100644
--- a/ide/ideoptionsdlg.lfm
+++ b/ide/ideoptionsdlg.lfm
@@ -19,8 +19,8 @@ object IDEOptionsDialog: TIDEOptionsDialog
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     Left = 6
-    Height = 36
-    Top = 362
+    Height = 34
+    Top = 364
     Width = 677
     BorderSpacing.Left = 6
     BorderSpacing.Right = 6
@@ -40,18 +40,18 @@ object IDEOptionsDialog: TIDEOptionsDialog
   end
   object CatTVSplitter: TSplitter
     Left = 255
-    Height = 362
+    Height = 364
     Top = 0
     Width = 4
   end
   object CategoryPanel: TPanel
     Left = 0
-    Height = 362
+    Height = 364
     Top = 0
     Width = 255
     Align = alLeft
     BevelOuter = bvNone
-    ClientHeight = 362
+    ClientHeight = 364
     ClientWidth = 255
     Constraints.MinWidth = 150
     TabOrder = 2
@@ -63,12 +63,12 @@ object IDEOptionsDialog: TIDEOptionsDialog
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = SettingsPanel
       Left = 6
-      Height = 304
-      Top = 38
+      Height = 310
+      Top = 34
       Width = 249
       Anchors = [akTop, akLeft, akRight, akBottom]
       BorderSpacing.Top = 5
-      DefaultItemHeight = 18
+      DefaultItemHeight = 16
       ReadOnly = True
       TabOrder = 0
       OnChange = CategoryTreeChange
@@ -81,7 +81,7 @@ object IDEOptionsDialog: TIDEOptionsDialog
       AnchorSideLeft.Control = CategoryPanel
       AnchorSideRight.Side = asrBottom
       Left = 6
-      Height = 25
+      Height = 21
       Top = 8
       Width = 200
       OnFilterItem = FilterEditFilterItem
@@ -90,7 +90,6 @@ object IDEOptionsDialog: TIDEOptionsDialog
       NumGlyphs = 1
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 6
-      Font.Color = clBtnShadow
       MaxLength = 0
       ParentFont = False
       TabOrder = 1
@@ -99,7 +98,7 @@ object IDEOptionsDialog: TIDEOptionsDialog
     object SettingsPanel: TPanel
       Left = 0
       Height = 20
-      Top = 342
+      Top = 344
       Width = 255
       Align = alBottom
       AutoSize = True
@@ -122,9 +121,9 @@ object IDEOptionsDialog: TIDEOptionsDialog
     TabOrder = 3
     object BuildModeLabel: TLabel
       Left = 12
-      Height = 15
+      Height = 13
       Top = 10
-      Width = 62
+      Width = 51
       Caption = 'Build Mode'
       ParentColor = False
     end
@@ -133,13 +132,12 @@ object IDEOptionsDialog: TIDEOptionsDialog
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = BuildModeLabel
       AnchorSideTop.Side = asrCenter
-      Left = 81
-      Height = 29
-      Top = 3
+      Left = 70
+      Height = 21
+      Top = 6
       Width = 154
       BorderSpacing.Left = 7
-      ItemHeight = 0
-      OnClick = BuildModeComboBoxClick
+      ItemHeight = 13
       OnSelect = BuildModeComboBoxSelect
       Style = csDropDownList
       TabOrder = 0
@@ -149,9 +147,9 @@ object IDEOptionsDialog: TIDEOptionsDialog
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = BuildModeComboBox
       AnchorSideTop.Side = asrCenter
-      Left = 334
+      Left = 311
       Height = 25
-      Top = 5
+      Top = 4
       Width = 25
       BorderSpacing.Left = 15
       Caption = '...'
@@ -163,10 +161,10 @@ object IDEOptionsDialog: TIDEOptionsDialog
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = BuildModeComboBox
       AnchorSideTop.Side = asrCenter
-      Left = 241
-      Height = 24
-      Top = 5
-      Width = 78
+      Left = 230
+      Height = 17
+      Top = 8
+      Width = 66
       BorderSpacing.Left = 6
       Caption = 'In session'
       OnChange = BuildModeInSessionCheckBoxChange
@@ -182,10 +180,10 @@ object IDEOptionsDialog: TIDEOptionsDialog
     AnchorSideTop.Side = asrBottom
     AnchorSideBottom.Control = ButtonPanel
     Left = 259
-    Height = 322
+    Height = 324
     Top = 40
     Width = 427
-    HorzScrollBar.Page = 425
+    HorzScrollBar.Page = 423
     HorzScrollBar.Tracking = True
     VertScrollBar.Page = 320
     VertScrollBar.Tracking = True
diff --git a/ide/ideoptionsdlg.pas b/ide/ideoptionsdlg.pas
index 9bb2ff0ef9..7c553f5f99 100644
--- a/ide/ideoptionsdlg.pas
+++ b/ide/ideoptionsdlg.pas
@@ -62,7 +62,6 @@ type
     EditorsPanel: TScrollBox;
     FilterEdit: TTreeFilterEdit;
     SettingsPanel: TPanel;
-    procedure BuildModeComboBoxClick(Sender: TObject);
     procedure BuildModeComboBoxSelect(Sender: TObject);
     procedure BuildModeInSessionCheckBoxChange(Sender: TObject);
     procedure BuildModeManageButtonClick(Sender: TObject);
@@ -134,6 +133,7 @@ begin
   FEditorToOpen := nil;
   SettingsPanel.Constraints.MinHeight:=0;
   BuildModeSelectPanel.Height:=0;
+  BuildModeLabel.Caption:=lisBuildMode;
   BuildModeInSessionCheckBox.Caption:=lisInSession;
   BuildModeInSessionCheckBox.Hint:=
     lisEnableThisToStoreTheBuildModeInYourSessionLpsInste;
@@ -218,11 +218,6 @@ begin
   end;
 end;
 
-procedure TIDEOptionsDialog.BuildModeComboBoxClick(Sender: TObject);
-begin
-
-end;
-
 procedure TIDEOptionsDialog.BuildModeComboBoxSelect(Sender: TObject);
 begin
   if AllBuildModes then begin
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index fb63e6862f..817e4dbf31 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -5368,6 +5368,7 @@ resourcestring
   dlgIdeMacroValues = 'IDE Macro Values';
   lisBuildModes = 'Build modes';
   lisInSession = 'In session';
+  lisBuildMode = 'Build Mode';
   lisEnableThisToStoreTheBuildModeInYourSessionLpsInste = 'Enable this to '
     +'store the build mode in your session (.lps) instead of the lpi';
   lisThereMustBeAtLeastOneBuildMode = 'There must be at least one build mode.';