More effective solution to preventing click capture

My first attempt had a few not-so-great side effects. This (hopefully) does the trick.