Edge case fixes and cleanup

- Update kbd shortcut modal
- clean up event propagation so save isn't called multiple times
- only call unInsert on esc if editing