BUGR-11338 - Navigation Issue

https://apps.topcoder.com/bugs/browse/BUGR-11338