Fixed: Back/Cancel on add notification won't break saving settings