diff --git a/web/src/utils/mod.rs b/web/src/utils/mod.rs
index 35186b29..f0957163 100644
--- a/web/src/utils/mod.rs
+++ b/web/src/utils/mod.rs
@@ -23,5 +23,5 @@ pub fn get_return_url_for_date(date: &NaiveDate) -> String {
         return String::from("/");
     }
 
-    format!("/?date={}", date)
+    format!("/calendar?date={}", date)
 }
diff --git a/web/templates/availability/new_or_edit.html b/web/templates/availability/new_or_edit.html
index a32bbd7e..63497842 100644
--- a/web/templates/availability/new_or_edit.html
+++ b/web/templates/availability/new_or_edit.html
@@ -111,7 +111,7 @@
               </button>
             </div>
             <div class="control">
-              <a class="button is-link is-light" hx-boost="true" href="/?date={{ date }}">
+              <a class="button is-link is-light" hx-boost="true" href="/calendar?date={{ date }}">
                 <svg class="icon">
                   <use href="/static/feather-sprite.svg#arrow-left" />
                 </svg>
diff --git a/web/templates/calendar.html b/web/templates/calendar.html
index c050e398..51fc55eb 100644
--- a/web/templates/calendar.html
+++ b/web/templates/calendar.html
@@ -8,7 +8,7 @@
       <div class="level is-hidden-mobile">
         <div class="level-left">
           <a hx-boost="true" class="button is-link level-item"
-             href="/?date={{ date.pred() }}{{ selected_area|show_area_query(false) }}">
+             href="/calendar?date={{ date.pred() }}{{ selected_area|show_area_query(false) }}">
             <svg class="icon">
               <use href="/static/feather-sprite.svg#arrow-left" />
             </svg>
@@ -37,7 +37,7 @@
 
         <div class="level-right">
           <a hx-boost="true" class="button is-link level-item"
-             href="/?date={{ date.succ() }}{{ selected_area|show_area_query(false) }}">
+             href="/calendar?date={{ date.succ() }}{{ selected_area|show_area_query(false) }}">
             <svg class="icon">
               <use href="/static/feather-sprite.svg#arrow-right" />
             </svg>
@@ -49,7 +49,7 @@
       <div class="level is-hidden-tablet is-mobile">
         <div class="level-left">
           <a hx-boost="true" class="button is-link level-item"
-             href="/?date={{ date.pred() }}{{ selected_area|show_area_query(false) }}">
+             href="/calendar?date={{ date.pred() }}{{ selected_area|show_area_query(false) }}">
             <svg class="icon">
               <use href="/static/feather-sprite.svg#arrow-left" />
             </svg>
@@ -63,7 +63,7 @@
 
         <div class="level-right">
           <a hx-boost="true" class="button is-link level-item"
-             href="/?date={{ date.succ() }}{{ selected_area|show_area_query(false) }}">
+             href="/calendar?date={{ date.succ() }}{{ selected_area|show_area_query(false) }}">
             <svg class="icon">
               <use href="/static/feather-sprite.svg#arrow-right" />
             </svg>
diff --git a/web/templates/events/new_or_edit.html b/web/templates/events/new_or_edit.html
index 0260911d..3b9a65e7 100644
--- a/web/templates/events/new_or_edit.html
+++ b/web/templates/events/new_or_edit.html
@@ -225,7 +225,7 @@
               </button>
             </div>
             <div class="control">
-              <a class="button is-link is-light" hx-boost="true" href="/?date={{ date }}">
+              <a class="button is-link is-light" hx-boost="true" href="/calendar?date={{ date }}">
                 <svg class="icon">
                   <use href="/static/feather-sprite.svg#arrow-left" />
                 </svg>
diff --git a/web/templates/events/plan.html b/web/templates/events/plan.html
index 46080826..148304ce 100644
--- a/web/templates/events/plan.html
+++ b/web/templates/events/plan.html
@@ -64,7 +64,7 @@
     </div>
 
     <div class="control">
-      <a class="button is-link is-light" hx-boost="true" href="/?date={{ event.start.date() }}">
+      <a class="button is-link is-light" hx-boost="true" href="/calendar?date={{ event.start.date() }}">
         <svg class="icon">
           <use href="/static/feather-sprite.svg#arrow-left" />
         </svg>