diff --git a/src/ce_editor.pas b/src/ce_editor.pas
index c39d4a11..a16af007 100644
--- a/src/ce_editor.pas
+++ b/src/ce_editor.pas
@@ -298,6 +298,8 @@ procedure TCEEditorWidget.focusedEditorChanged;
 begin
   if fDoc = nil then exit;
   //
+  fSyncEdit.Clear;
+  macRecorder.Clear;
   macRecorder.Editor := fDoc;
   fSyncEdit.Editor := fDoc;
   completion.Editor := fDoc;
@@ -417,6 +419,8 @@ begin
     editorStatus.Panels[0].Text := format('%d : %d | %d', [fDoc.CaretY, fDoc.CaretX, fDoc.SelEnd - fDoc.SelStart]);
     editorStatus.Panels[1].Text := modstr[fDoc.modified];
     editorStatus.Panels[2].Text := fDoc.fileName;
+    //
+    if completion.IsActive then getCompletionList;
   end;
 end;