Partial fix to navigation key issue