@@ -5199,6 +5199,8 @@ procedure TComponent.InsertComponent(AComponent: TComponent);
begin
AComponent.ValidateContainer(Self);
+ if AComponent.FOwner <> nil then
+ AComponent.FOwner.RemoveComponent(AComponent);
ValidateRename(AComponent,'',AComponent.FName);
Insert(AComponent);
If csDesigning in FComponentState then