Fix for focus not returned to window when app removed on another desktop