The problem here is that not all products have this org selector so we cant really make it wait until the org selector appears