Fix focus on select (round 2)

Fixes #3736 which attempted to fix #3643.

Handles focus on all tab-switching intentioned actions (next / prev tab, numbered tab, and history)

Please review @devoncarew