revert #2207 (focusing popup close button) to fix #2254