Re-introduce waiting logic to address grid browser timeout