Use editor API
Fix menus
Cancel when out of focus