move the call that sets the focus later so it actually happens

merge to the release branch, please