FLO-6462 always register for click events