Cleaner fix to a previous incompleteness bug.
Fixing lack of a reset to focus function.