Re: #1440 focus bug fixed