MP1-3563-BUG : Fix navigation issue