[#3159] Fix none transitions

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