diff --git a/src/ce_editor.pas b/src/ce_editor.pas
index 9a124b4e..6de9a001 100644
--- a/src/ce_editor.pas
+++ b/src/ce_editor.pas
@@ -355,9 +355,15 @@ procedure TCEEditorWidget.setToolBarFlat(value: boolean);
 begin
   inherited setToolBarFlat(value);
   if value then
+  begin
+    fOptions.pageOptions:= fOptions.pageOptions + [poFlatButtons];
     pageControl.options := pageControl.options + [poFlatButtons]
+  end
   else
+  begin
+    fOptions.pageOptions:= fOptions.pageOptions - [poFlatButtons];
     pageControl.options := pageControl.options - [poFlatButtons];
+  end;
 end;
 {$ENDREGION}