Harden Click Handler