Fix loss of Step1 Buttons when Save Alert is shown