Fixes #4269.
Merge pull request #4291 from pchote/fix-the-frelling-editor

Fixes #4269.