Issue #2199 - Set focus to popup close button when popup is opened.

#2199