Add explicit support for term focus