diff --git a/src/ce_editor.pas b/src/ce_editor.pas
index 7695e72a..c3fb6431 100644
--- a/src/ce_editor.pas
+++ b/src/ce_editor.pas
@@ -59,8 +59,6 @@ type
   public
     constructor create(aOwner: TComponent); override;
     destructor destroy; override;
-    procedure addEditor;
-    procedure removeEditor(const aIndex: NativeInt);
     procedure focusedEditorChanged;
     //
     procedure docNew(aDoc: TCESynMemo);
@@ -85,9 +83,8 @@ var
   i: integer;
 begin
   inherited;
-  for i := 0 to ComponentCount-1 do
-    if (Components[i] is TWinControl) then
-      TWinControl(Components[i]).Visible:= Value;
+  for i := 0 to ControlCount-1 do
+    Controls[i].Visible:= Value;
 end;
 
 {$REGION Standard Comp/Obj------------------------------------------------------}
@@ -116,8 +113,14 @@ begin
 end;
 
 destructor TCEEditorWidget.destroy;
+var
+  i: integer;
 begin
   EntitiesConnector.removeObserver(self);
+  for i := 0 to PageControl.PageCount-1 do
+    if PageControl.Page[i].ControlCount > 0 then
+      if (PageControl.Controls[0] is TCESynMemo) then
+        PageControl.Controls[0].Free;
   tokLst.Free;
   errLst.Free;
   inherited;
@@ -142,14 +145,38 @@ end;
 
 {$REGION ICEMultiDocObserver ---------------------------------------------------}
 procedure TCEEditorWidget.docNew(aDoc: TCESynMemo);
+var
+  sheet: TCEEditorPage;
 begin
+  sheet := TCEEditorPage.Create(self);
+  sheet.PageControl := PageControl;
+  //
+  aDoc.Align := alClient;
+  aDoc.Parent := sheet;
+  //
+  aDoc.OnKeyDown := @memoKeyDown;
+  aDoc.OnKeyUp := @memoKeyDown;
+  aDoc.OnKeyPress := @memoKeyPress;
+  aDoc.OnMouseDown := @memoMouseDown;
+  aDoc.OnMouseMove := @memoMouseMove;
+  aDoc.OnClickLink := @memoCtrlClick;
+  //
+  fDoc := aDoc;
+  pageControl.ActivePage := sheet;
+  focusedEditorChanged;
+  beginUpdateByDelay;
+  UpdateByEvent;
 end;
 
 procedure TCEEditorWidget.docClosing(aDoc: TCESynMemo);
+var
+  sheet: TWinControl;
 begin
   if fDoc <> aDoc then exit;
+  sheet := fDoc.Parent;
+  fDoc.Parent := nil;
   fDoc := nil;
-  PageControl.Update;
+  if sheet <> nil then sheet.Free;
   UpdateByEvent;
 end;
 
@@ -221,34 +248,6 @@ begin
   Value := Value[1..length(Value)-20];
 end;
 
-procedure TCEEditorWidget.addEditor;
-var
-  sheet: TCEEditorPage;
-  memo: TCESynMemo;
-begin
-  sheet := TCEEditorPage.Create(self);
-  memo  := TCESynMemo.Create(sheet);
-  sheet.PageControl := PageControl;
-  //
-  memo.Align := alClient;
-  memo.Parent := sheet;
-  //
-  memo.OnKeyDown := @memoKeyDown;
-  memo.OnKeyUp := @memoKeyDown;
-  memo.OnKeyPress := @memoKeyPress;
-  memo.OnMouseDown := @memoMouseDown;
-  memo.OnMouseMove := @memoMouseMove;
-  memo.OnClickLink := @memoCtrlClick;
-  //
-  pageControl.ActivePage := sheet;
-end;
-
-procedure TCEEditorWidget.removeEditor(const aIndex: NativeInt);
-begin
-  editor[aIndex].OnChange:= nil;
-  pageControl.Pages[aIndex].Free;
-end;
-
 procedure TCEEditorWidget.memoKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
 begin
   UpdateByEvent;
diff --git a/src/ce_main.pas b/src/ce_main.pas
index 61952f82..4ad320f4 100644
--- a/src/ce_main.pas
+++ b/src/ce_main.pas
@@ -989,8 +989,7 @@ end;
 
 procedure TCEMainForm.newFile;
 begin
-  if fEditWidg = nil then exit;
-  fEditWidg.addEditor;
+  TCESynMemo.Create(nil);
 end;
 
 function TCEMainForm.findFile(const aFilename: string): NativeInt;
@@ -1017,10 +1016,9 @@ begin
     fEditWidg.PageControl.PageIndex := i;
     exit;
   end;
-  i := fEditWidg.editorCount;
-  fEditWidg.addEditor;
-  fEditWidg.editor[i].loadFromFile(aFilename);
-  fEditWidg.focusedEditorChanged;
+  TCESynMemo.Create(nil);
+  if fDoc = nil then exit;
+  fDoc.loadFromFile(aFilename);
   fFileMru.Insert(0, aFilename);
 end;
 
@@ -1148,7 +1146,8 @@ begin
       'The latest mdofifications are not saved, continue ?') = mrCancel
       then exit;
   //
-  fEditWidg.removeEditor(fEditWidg.editorIndex);
+  fDoc.Free;
+  //fEditWidg.removeEditor(fEditWidg.editorIndex);
 end;
 
 procedure TCEMainForm.actFileSaveAllExecute(Sender: TObject);