Event handlers fixed for cross-browser

Forgot to add the cross browser implementation in the last update