Fix too greedy click handler