Ensure valid menu row when switching instruments, return to last state