You do have to select "Gotta wait for Shadow" at least once, though; if you don't consciously communicate your intention, he won't come running at the last second.