focus is saved incorrectly fix SSW-18