Fixes 2136: music keeps playing
Addendum to #2136 - remove selectors
Merge pull request #2296 from mikemee/master

Fixes 2136: music keeps playing