[BUG #8117] Fixed click events