Merge pull request #1000 from jay-hodgson/release-44

Merge change from release-45/develop to release-44
SWC-1447: clean up click handling in the hopes of solving issue that I cannot reproduce locally