SWC-1654: Next button not appearing because of new tooltip behavior