Improve tab switching.