Restore overzealously removed focus() calls in c52b6f6bb8

see #28