Fix editor loading
Merge pull request #220 from twiss/issue-194

[issue-194] Fix editor loading