Heaven Can Wait was an EP released by German power metal band Gamma Ray in 1990, following the release of their debut album Heading for Tomorrow.

It is notable as Dirk Schlächter makes his first appearance as a full member of the band.

He would go on to appear on every Gamma Ray record to date.

Outlaw", and "Lonesome Stranger" are bonus tracks on the 2003 remaster of Heading for Tomorrow, while "Who Do You Think You Are?"

The European EP contains the so-called "band version" of the song, i.e. with Dirk Schlächter on guitar and Uli Kusch on drums.