Stopped clearing current selection so users can get back to their last selection when navigating back to field settings