Added focus to select handler to fix tab switching

Quick fix for maintaining focus during tab switch.

Fixes #3643 

Please review, @rpaquay