Properly update navigation actions, references #621