Merge pull request #1237 from scop/fix/editor-fallback