Make sure to halt click event
Merge pull request #442 from mitechie/fix-click-handler