Finish fix to navigation key issue