Fix another instance of structural navigation looping