Focus annotation when linking highlights
Make comment editing behavior consistent