Fixup editor events instead of defering

Fixes #70