Improve focus behavior