Fixed issue where focus was not fully returned to parent view