[#3121] Handle event selection and deselection before firing related events

https://webmademovies.lighthouseapp.com/projects/65733-popcorn-maker/tickets/3123