Improve editor behavior