Fix cancel button issue