diff --git a/components/dockedformeditor/source/dockedmainide.pas b/components/dockedformeditor/source/dockedmainide.pas
index 8169628a1e..a3306e6504 100644
--- a/components/dockedformeditor/source/dockedmainide.pas
+++ b/components/dockedformeditor/source/dockedmainide.pas
@@ -239,6 +239,7 @@ var
 begin
   {$IFDEF DEBUGDOCKEDFORMEDITOR} DebugLn('TDockedTabMaster.ShowCode'); {$ENDIF}
   if ASourceEditor = nil then Exit;
+  SourceEditorManagerIntf.ActiveEditor := ASourceEditor;
   LPageCtrl := SourceWindows.FindPageControl(ASourceEditor);
   LPageCtrl.ShowCode;
   ASourceEditor.EditorControl.SetFocus;
@@ -250,6 +251,7 @@ var
 begin
   {$IFDEF DEBUGDOCKEDFORMEDITOR} DebugLn('TDockedTabMaster.ShowDesigner'); {$ENDIF}
   if ASourceEditor = nil then Exit;
+  SourceEditorManagerIntf.ActiveEditor := ASourceEditor;
   LPageCtrl := SourceWindows.FindPageControl(ASourceEditor);
   LPageCtrl.ShowDesigner(AIndex);
 end;