Instead of checking an element which might me replaced by AJAX, just wait for another element
Closes #3532920