Issue #23345:correctly set tab index during clear
Merge pull request #336 from garyhgohoos/23345

Issue #23345:correctly set tab index during clear