Fixing event handling in visual editor