SWC-1447: clean up click handling in the hopes of solving issue that I cannot reproduce locally