Issue #24831:set focus in prep for next entry