Updated function to go to correct options pane. Closes # 4319