Modified navigate trigger behaviour