Fix save button handling, refs #CB-11648