I think this is ok here for now since this is the only place scroll is affected. We should consider moving this into Editor whenever this is required from someplace else