Proper handleOnShow behavior now.