fix propagation issue with click handling