Added initial fix for ticket issues.
Removed editor.focus() since it was not necessary, but allowed us to revert previous, simpler interface.