SONAR-4851 Fix bug with click event propagation