Follow-up to #13907: simplify JS logic for focus shim
Merge pull request #14160 from hnrch02/simplify-button-focus-logic

Follow-up to #13907: simplify JS logic for focus shim