More intuitive event navigation

When you click on an event on the homepage you will go to the event page now. There you can click on '<- Back to calendar' but that brings you back to the archive of events. I think it would make more sense that when you do this on a page that falls under the category "upcoming events" that when you press 'Back to calendar' it brings you to the page with "Upcoming events" instead of the archive.