Move save trigger to the right place.