Beginning in 2002, Edlund was employed by Joss Whedon at Mutant Enemy, first as part of the original writing staff for the space/Western hybrid series "Firefly", which was cancelled during its first season, and then on the final season of "Angel", where he wrote and also directed the Hugo Award nominated episode, "Smile Time." Edlund credits Whedon with his education on creating character arcs for television. Edlund also had a hand in creating characters for Whedon's successful web-series "Doctor Horrible's Sing-Along Blog", to which he contributed "Bad Horse" and the henchman sidekick "Moist."