diff --git a/ide/codetoolsdefines.lfm b/ide/codetoolsdefines.lfm
index 05c03bdc7f..de88601f32 100644
--- a/ide/codetoolsdefines.lfm
+++ b/ide/codetoolsdefines.lfm
@@ -75,7 +75,7 @@ object CodeToolsDefinesEditor: TCodeToolsDefinesEditor
       Caption = 'VariableLabel'
       ParentColor = False
     end
-    object ValueNoteBook: TNotebook
+    object ValueNoteBook: TPageControl
       Left = 6
       Height = 198
       Top = 106
@@ -84,9 +84,8 @@ object CodeToolsDefinesEditor: TCodeToolsDefinesEditor
       Anchors = [akTop, akLeft, akRight, akBottom]
       BorderSpacing.Around = 6
       OnPageChanged = ValueNoteBookPageChanged
-      PageIndex = 0
       TabOrder = 0
-      object ValueAsTextPage: TPage
+      object ValueAsTextPage: TTabSheet
         Caption = 'ValueAsTextPage'
         ClientWidth = 508
         ClientHeight = 170
@@ -698,7 +697,7 @@ object CodeToolsDefinesEditor: TCodeToolsDefinesEditor
           end
         end
       end
-      object ValueAsPathsPage: TPage
+      object ValueAsPathsPage: TTabSheet
         Caption = 'ValueAsPathsPage'
         ClientWidth = 508
         ClientHeight = 168
diff --git a/ide/codetoolsdefines.pas b/ide/codetoolsdefines.pas
index 30e0f05d95..038bc66a75 100644
--- a/ide/codetoolsdefines.pas
+++ b/ide/codetoolsdefines.pas
@@ -72,8 +72,8 @@ type
     MenuItem29: TMenuItem;
     MenuItem3: TMenuItem;
     MenuItem30: TMenuItem;
-    ValueAsTextPage: TPage;
-    ValueAsPathsPage: TPage;
+    ValueAsTextPage: TTabSheet;
+    ValueAsPathsPage: TTabSheet;
     MainSplitter: TSplitter;
     MainMenu: TMainMenu;
     
@@ -167,7 +167,7 @@ type
     DescriptionEdit: TEdit;
     VariableLabel: TLabel;
     VariableEdit: TEdit;
-    ValueNoteBook: TNoteBook;
+    ValueNoteBook: TPageControl;
     ValueAsTextSynEdit: TSynEdit;
     ValueAsFilePathsSynEdit: TSynEdit;
     MoveFilePathUpBitBtn: TBitBtn;
diff --git a/ide/main.pp b/ide/main.pp
index 5e88c7374f..630f9cf3b0 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -628,7 +628,7 @@ type
     procedure ConnectMainBarEvents;
     procedure SetupSpeedButtons;
     procedure SetupDialogs;
-    procedure SetupComponentNoteBook;
+    procedure SetupComponentPalette;
     procedure SetupHints;
     procedure SetupOutputFilter;
     procedure SetupObjectInspector;
@@ -1324,7 +1324,7 @@ begin
     SetupStandardIDEMenuItems;
     SetupMainMenu;
     SetupSpeedButtons;
-    SetupComponentNoteBook;
+    SetupComponentPalette;
     ConnectMainBarEvents;
   finally
     MainIDEBar.EnableAutoSizing{$IFDEF DebugDisableAutoSizing}('TMainIDE.Create'){$ENDIF};
@@ -1822,9 +1822,9 @@ begin
   TestCompilerOptions:=@OnCompilerOptionsDialogTest;
 end;
 
-procedure TMainIDE.SetupComponentNoteBook;
+procedure TMainIDE.SetupComponentPalette;
 begin
-  // Component Notebook
+  // Component palette
   MainIDEBar.ComponentPageControl := TPageControl.Create(OwningComponent);
   with MainIDEBar.ComponentPageControl do begin
     Name := 'ComponentPageControl';