Issue #18742:fix tab order