Bring standalone element link behaviour into line with athena, again

This is a cherry-pick of !34287 (merged), which unfortunately went into 21.2 a long time ago and was never ported to the more recent releases... UNTIL NOW!

I think this was a great change. Tagging the original author, the amazing @jburr.