#1052 Fi x keywords editor issues reported by @akbargumbiar