BZ997369 - Button focus glitch
(cherry picked from commit 1769c23d884c57d013bc3f2e19e79a61f674b70a)