fix #2598: personal note editing layout problem
Merge branch 'issue-2598' into upstream