diff --git a/src/u_dockoptions.pas b/src/u_dockoptions.pas
index 4f3045fe..14afbd74 100644
--- a/src/u_dockoptions.pas
+++ b/src/u_dockoptions.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, AnchorDocking, AnchorDockOptionsDlg, XMLPropStorage,
-  AnchorDockStr, Forms, Controls, u_observer, u_interfaces;
+  AnchorDockStr, LCLVersion, Forms, Controls, u_observer, u_interfaces;
 
 type
 
@@ -50,7 +50,9 @@ begin
   HideHeaderCaptionForFloatingCheckBox.OnChange := @doChanged;
   FlattenHeadersCheckBox.OnChange := @doChanged;
   FilledHeadersCheckBox.OnChange := @doChanged;
+  {$if lcl_fullversion >= 2020000}
   FloatingWindowsOnTop.Visible := false;
+  {$endif}
   //
   HeaderStyleComboBox.OnChange := @doChanged;
   //
diff --git a/src/u_main.lfm b/src/u_main.lfm
index 1143f300..43bcd2f0 100644
--- a/src/u_main.lfm
+++ b/src/u_main.lfm
@@ -11,6 +11,7 @@ object MainForm: TMainForm
   OnDropFiles = FormDropFiles
   OnResize = FormResize
   ShowHint = True
+  LCLVersion = '2.2.0.1'
   object mainMenu: TMainMenu
     Top = 1
     object MenuItem1: TMenuItem
diff --git a/src/u_main.pas b/src/u_main.pas
index e67b9521..f33d2224 100644
--- a/src/u_main.pas
+++ b/src/u_main.pas
@@ -1723,6 +1723,9 @@ var
   h: TAnchorDockHostSite;
 begin
 
+  {$if lcl_fullversion >= 2020000}
+  DockMaster.MainDockForm := self;
+  {$endif}
   fDockingIsInitialized := true;
 
   if not reset then
@@ -3732,6 +3735,7 @@ begin
   layoutUpdateMenu;
 end;
 
+{$if lcl_fullversion < 2020000}
 procedure TMainForm.updateFloatingWidgetOnTop(onTop: boolean);
 var
   widg: TDexedWidget;
@@ -3742,6 +3746,12 @@ begin
     widg.Parent.Parent.isNotAssigned and widg.isDockable then
       TForm(widg.Parent).FormStyle := fstyle[onTop];
 end;
+{$else}
+procedure TMainForm.updateFloatingWidgetOnTop(onTop: boolean);
+begin
+  DockMaster.FloatingWindowsOnTop := onTop;
+end;
+{$endif}
 
 procedure TMainForm.snapTopSplitterToMenu;
 var
diff --git a/src/u_optionseditor.pas b/src/u_optionseditor.pas
index 1d1f9113..909b6588 100644
--- a/src/u_optionseditor.pas
+++ b/src/u_optionseditor.pas
@@ -71,8 +71,8 @@ begin
   fIsDockable := false;
   fIsModal:= true;
   fEdOptsSubj := TEditableOptionsSubject.create;
-  inspector.CheckboxForBoolean := true;
   inspector.PropertyEditorHook.AddHandlerModified(@inspectorModified);
+  inspector.CheckboxForBoolean := true;
   inspector.DefaultItemHeight := scaleY(22, 96);
   selCat.Width := ScaleX(180, 96);
   width := ScaleX(600, 96);