Fixed issue with focus not being fully returned to parent view