Fix caret position
Merge pull request #7872 from burnsra/3.0.0-wip-caret

Fix caret position