Fix focus not returning to current window when an app is removed on another desktop