Nicer solution to the activate on click problem