Follow-up to sorting out the tabbing order
Merge pull request #2098 from ussuri/sort-out-tabbing-order

Follow-up to sorting out the tabbing order