ENH: Fixed terminal focus issues