Tkt 2497: Add a Cancel Button