Fix nav listener