add condition to popup focus
Merge branch '1.4.1'