Another small fix on focus