Tab navigation bug fix