diff --git a/designer/anchoreditor.lfm b/designer/anchoreditor.lfm
index 733f3ba435..b101496af7 100644
--- a/designer/anchoreditor.lfm
+++ b/designer/anchoreditor.lfm
@@ -9,7 +9,6 @@ object AnchorDesigner: TAnchorDesigner
   ClientWidth = 596
   Constraints.MinHeight = 282
   Constraints.MinWidth = 476
-  OnClose = FormClose
   OnCreate = AnchorDesignerCreate
   OnDestroy = AnchorDesignerDestroy
   OnShow = AnchorDesignerShow
diff --git a/designer/anchoreditor.pas b/designer/anchoreditor.pas
index b94e80f08a..9a527fe15a 100644
--- a/designer/anchoreditor.pas
+++ b/designer/anchoreditor.pas
@@ -136,7 +136,6 @@ type
     procedure AnchorDesignerShow(Sender: TObject);
     procedure AnchorEnabledCheckBoxChange(Sender: TObject);
     procedure BorderSpaceSpinEditChange(Sender: TObject);
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure SiblingComboBoxChange(Sender: TObject);
     procedure ReferenceSideButtonClicked(Sender: TObject);
   private
@@ -262,8 +261,6 @@ begin
 
   GlobalDesignHook.AddHandlerRefreshPropertyValues(@OnRefreshPropertyValues);
   GlobalDesignHook.AddHandlerSetSelection(@OnSetSelection);
-
-  IDEDialogLayoutList.ApplyLayout(Self);
 end;
 
 procedure TAnchorDesigner.AnchorDesignerDestroy(Sender: TObject);
@@ -279,11 +276,6 @@ begin
   Refresh(true);
 end;
 
-procedure TAnchorDesigner.FormClose(Sender: TObject; var CloseAction: TCloseAction);
-begin
-  IDEDialogLayoutList.SaveLayout(Self);
-end;
-
 procedure TAnchorDesigner.AnchorEnabledCheckBoxChange(Sender: TObject);
 var
   Kind: TAnchorKind;
diff --git a/designer/taborderdlg.lfm b/designer/taborderdlg.lfm
index a8dc3920fe..a82d276a69 100644
--- a/designer/taborderdlg.lfm
+++ b/designer/taborderdlg.lfm
@@ -7,10 +7,10 @@ object TabOrderDialog: TTabOrderDialog
   Caption = 'TabOrderDialog'
   ClientHeight = 374
   ClientWidth = 310
-  OnClose = FormClose
   OnCreate = TabOrderDialogCREATE
   OnShow = FormShow
   LCLVersion = '0.9.31'
+  Visible = True
   object ArrowUp: TSpeedButton
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
diff --git a/designer/taborderdlg.pas b/designer/taborderdlg.pas
index 0d18c84096..a8298e8606 100644
--- a/designer/taborderdlg.pas
+++ b/designer/taborderdlg.pas
@@ -45,7 +45,6 @@ type
     ItemTreeview: TTreeView;
     SortByPositionButton: TBitBtn;
     procedure SortByPositionButtonClick(Sender: TObject);
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormShow(Sender: TObject);
     procedure ItemTreeviewClick(Sender: TObject);
     procedure TabOrderDialogCREATE(Sender: TObject);
@@ -136,8 +135,6 @@ begin
   ArrowDown.Hint:=lisTabOrderDownHint;
   ArrowUp.Hint:=lisTabOrderUpHint;
   SortByPositionButton.Hint:=lisTabOrderSortHint;
-
-  IDEDialogLayoutList.ApplyLayout(Self);
 end;
 
 procedure TTabOrderDialog.FormShow(Sender: TObject);
@@ -155,11 +152,6 @@ begin
   CheckButtonsEnabled;
 end;
 
-procedure TTabOrderDialog.FormClose(Sender: TObject; var CloseAction: TCloseAction);
-begin
-  IDEDialogLayoutList.SaveLayout(Self);
-end;
-
 procedure TTabOrderDialog.SortByPositionButtonClick(Sender: TObject);
 var
   FirstItem, CurrItem: TTreeNode;