Preserve focus when editing annotation