LUN-1678 : Fix Save button not working after alert is displayed