Merge pull request #2097 from ussuri/sort-out-tabbing-order

Sort out the tabbing order in the UI
Follow-up to sorting out the tabbing order