SWC-1447: clean up click handling in the hopes of solving issue that I cannot reproduce locally
Merge pull request #1005 from jay-hodgson/release-44

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