Issue #18742:fix tab order
Merge pull request #150 from garyhgohoos/18742

Issue #18742:fix tab order