She guest-starred along with Michele Lee in a February 2005 episode of "Will & Grace", and in December of that year, "", a retrospective of her career, opened on Broadway. She received another Tony nomination for her self-portrayal. Though she was expected to reprise her role in a Signature Theatre staging of "The Visit" in autumn of 2007, that was later postponed to the following season. Instead, she performed at New York's Feinstein's at the Regency supper club in New York for two weeks and, in 2008, appeared in a revised production of "The Visit" at the Signature Theatre in Arlington, Virginia, co-starring George Hearn. Rivera guest-starred on Disney Channel's "Johnny and the Sprites" as Queen of All Magical Beings. The episode debuted on March 15, 2008.