diff --git a/ide/helpmanager.pas b/ide/helpmanager.pas
index b5f858ce71..a0a6a8f13f 100644
--- a/ide/helpmanager.pas
+++ b/ide/helpmanager.pas
@@ -121,6 +121,7 @@ type
     NodesListBox: TListBox;
     procedure HelpSelectorDialogClose(Sender: TObject;
       var CloseAction: TCloseAction);
+    procedure NodesListBoxDblClick(Sender: TObject);
   private
     FNodes: THelpNodeQueryList;
     procedure SetNodes(const AValue: THelpNodeQueryList);
@@ -154,6 +155,11 @@ begin
   IDEDialogLayoutList.SaveLayout(Self);
 end;
 
+procedure THelpSelectorDialog.NodesListBoxDblClick(Sender: TObject);
+begin
+  ModalResult := mrOK;
+end;
+
 procedure THelpSelectorDialog.SetNodes(const AValue: THelpNodeQueryList);
 begin
   if FNodes=AValue then exit;
@@ -183,6 +189,7 @@ begin
   inherited Create(TheOwner);
   IDEDialogLayoutList.ApplyLayout(Self,500,300);
 
+  Caption := lisHelpSelectorDialog;
   NodesGroupBox.Caption:=lisSelectAHelpItem;
   OkButton.Caption:=lisLazBuildOk;
   CancelButton.Caption:=dlgCancel;
diff --git a/lcl/interfaces/carbon/carbonint.pas b/lcl/interfaces/carbon/carbonint.pas
index 9f0062191c..ce720d08ad 100644
--- a/lcl/interfaces/carbon/carbonint.pas
+++ b/lcl/interfaces/carbon/carbonint.pas
@@ -32,8 +32,6 @@ interface
 {$ASSERTIONS ON}
 {$endif}
 
-{off $Define Critical_Sections_Support}
-
 uses
   // rtl+ftl
   Types, Classes, SysUtils, Math, FPCAdds,
diff --git a/lcl/ldockctrl.pas b/lcl/ldockctrl.pas
index d0a1bbc6bb..c5d856cb6e 100644
--- a/lcl/ldockctrl.pas
+++ b/lcl/ldockctrl.pas
@@ -147,9 +147,9 @@ type
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
     function FindDockerByName(const ADockerName: string;
-                      Ignore: TCustomLazControlDocker): TCustomLazControlDocker;
+                Ignore: TCustomLazControlDocker = nil): TCustomLazControlDocker;
     function FindDockerByControl(AControl: TControl;
-                      Ignore: TCustomLazControlDocker): TCustomLazControlDocker;
+                Ignore: TCustomLazControlDocker = nil): TCustomLazControlDocker;
     function CreateUniqueName(const AName: string;
                               Ignore: TCustomLazControlDocker): string;
     function GetControlConfigName(AControl: TControl): string;
@@ -740,6 +740,34 @@ procedure TCustomLazControlDocker.RestoreLayout;
 var
   Layout: TLazDockerConfig;
   SelfNode: TLazDockConfigNode;
+  
+{  function FindControl(Node: TLazDockConfigNode): TControl;
+  begin
+    if Node.TheType=ldcntControl then
+      Result:=Manager.FindDockerByName(Node.Name)
+    else
+      Result:=nil;
+  end;
+
+  procedure FindSibling(Node: TLazDockConfigNode; Side: TAnchorKind;
+    out Sibling: TControl; out SiblingNode: TLazDockConfigNode;
+    out Distance: integer);
+  var
+    SiblingName: string;
+  begin
+    Sibling:=nil;
+    SiblingNode:=nil;
+    Distance:=10000;
+    if Node=nil then exit;
+    SiblingName:=Node.Sides[Side];
+    if SiblingName<>'' then begin
+      SiblingNode:=Layout.Root.FindByName(SiblingName,true,true);
+      Sibling:=FindControl(SiblingNode);
+      // TODO
+    end;
+  end;}
+  
+var
   NewBounds: TRect;
 begin
   DebugLn(['TCustomLazControlDocker.RestoreLayout A ',DockerName]);
@@ -748,7 +776,18 @@ begin
   if (Layout=nil) or (Layout.Root=nil) then exit;
   SelfNode:=Layout.Root.FindByName(DockerName,true);
   DebugLn(['TCustomLazControlDocker.RestoreLayout ',SelfNode<>nil,' DockerName=',DockerName,' ',Manager.Configs[0].DockerName]);
-  if SelfNode=nil then exit;
+  if (SelfNode=nil) or (SelfNode.TheType<>ldcntControl) then exit;
+  
+  if SelfNode.Parent<>nil then begin
+    // this control was docked
+    if SelfNode.Parent.TheType=ldcntPage then begin
+      // this control was docked as child of a page
+      DebugLn(['TCustomLazControlDocker.RestoreLayout TODO restore page']);
+    end else begin
+      // this control was docked on a form as child
+      //FindSibling(SelfNode,akLeft,LeftSibling,LeftSiblingDistance);
+    end;
+  end;
   
   // default: do not dock, just move
   DebugLn(['TCustomLazControlDocker.RestoreLayout ',DockerName,' not docking, just moving ...']);