Is not a complete fix as noted in the PR comments as focus isn't actually changed, but an incremental improvement for now.