[OE-2892] Reinstate cancel button