Close #143 - withOnShow not updating on navigation