Prevent multiple click events

Resloves issues with #2307