Resolved issue #2 - Proper tab not selected after shuffling controls