Quick workaround for click events not bubbling.
One more fix for issue #1642.