diff --git a/ht_booking/assets/i18n/en/main.ftl b/ht_booking/assets/i18n/en/main.ftl
index fa93f49..bd09727 100644
--- a/ht_booking/assets/i18n/en/main.ftl
+++ b/ht_booking/assets/i18n/en/main.ftl
@@ -53,6 +53,7 @@ settings = Settings
 settings-language = Language
 settings-theme = Theme
 view-details = Details
+pick-week = Go to week
 hour-from = From
 hour-to = Until
 repeat-weeks = Repeat for (weeks)
diff --git a/ht_booking/assets/i18n/sk/main.ftl b/ht_booking/assets/i18n/sk/main.ftl
index 762d503..61c7573 100644
--- a/ht_booking/assets/i18n/sk/main.ftl
+++ b/ht_booking/assets/i18n/sk/main.ftl
@@ -53,6 +53,7 @@ settings = Nastavenia
 settings-language = Jazyk
 settings-theme = Téma
 view-details = Detaily
+pick-week = Prejsť na týždeň
 hour-from = Od
 hour-to = Do
 repeat-weeks = Opakovať (počet týždňov)
diff --git a/ht_booking/assets/views/admin/booking_form.html b/ht_booking/assets/views/admin/booking_form.html
index 579f2d4..8b5d5fd 100644
--- a/ht_booking/assets/views/admin/booking_form.html
+++ b/ht_booking/assets/views/admin/booking_form.html
@@ -10,7 +10,7 @@
     <h1 class="text-2xl font-bold">
       {% if mode == "edit" %}{{ t(key="edit-booking", lang=lang) }}{% else %}{{ t(key="add-booking", lang=lang) }}{% endif %}
     </h1>
-    <a href="/admin" class="btn btn-ghost btn-sm">« {{ t(key="back-to-calendar", lang=lang) }}</a>
+    <a href="/admin?court={{ court_id }}&week={{ date }}" class="btn btn-ghost btn-sm">« {{ t(key="back-to-calendar", lang=lang) }}</a>
   </div>
 
   <div class="card border border-base-300 bg-base-100 shadow-sm">
@@ -84,7 +84,7 @@
         </div>
         <div class="flex items-center gap-2 pt-2">
           <button class="btn btn-neutral">{{ t(key="save", lang=lang) }}</button>
-          <a href="/admin" class="btn btn-ghost">{{ t(key="cancel", lang=lang) }}</a>
+          <a href="/admin?court={{ court_id }}&week={{ date }}" class="btn btn-ghost">{{ t(key="cancel", lang=lang) }}</a>
         </div>
       </form>
     </div>
diff --git a/ht_booking/assets/views/calendar/week.html b/ht_booking/assets/views/calendar/week.html
index 9aba281..82b1ff6 100644
--- a/ht_booking/assets/views/calendar/week.html
+++ b/ht_booking/assets/views/calendar/week.html
@@ -73,8 +73,12 @@
 <div class="mb-3 flex flex-wrap items-center justify-between gap-2">
   <div class="flex flex-wrap items-center gap-2">
     <div class="join">
+      {% if can_prev %}
       <a href="{{ base_path }}?court={{ court_id }}&week={{ prev_week }}"
         class="btn btn-sm join-item">« {{ t(key="prev-week", lang=lang) }}</a>
+      {% else %}
+      <span class="btn btn-sm join-item btn-disabled" aria-disabled="true">« {{ t(key="prev-week", lang=lang) }}</span>
+      {% endif %}
       <a href="{{ base_path }}?court={{ court_id }}&week={{ this_week }}"
         class="btn btn-sm join-item">{{ t(key="this-week", lang=lang) }}</a>
       <a href="{{ base_path }}?court={{ court_id }}&week={{ next_week }}"
@@ -90,6 +94,21 @@
       </svg>
       {{ t(key="view-details", lang=lang) }}
     </button>
+    <form method="get" action="{{ base_path }}" class="relative inline-flex">
+      <input type="hidden" name="court" value="{{ court_id }}">
+      <button type="button" id="cal-jump-btn" class="btn btn-sm gap-1"
+        title="{{ t(key='pick-week', lang=lang) }}">
+        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+          stroke="currentColor" class="h-4 w-4">
+          <path stroke-linecap="round" stroke-linejoin="round"
+            d="M6.75 3v2.25M17.25 3v2.25M3 18.75V7.5a2.25 2.25 0 0 1 2.25-2.25h13.5A2.25 2.25 0 0 1 21 7.5v11.25m-18 0A2.25 2.25 0 0 0 5.25 21h13.5A2.25 2.25 0 0 0 21 18.75m-18 0v-7.5A2.25 2.25 0 0 1 5.25 9h13.5A2.25 2.25 0 0 1 21 11.25v7.5" />
+        </svg>
+        {{ t(key="pick-week", lang=lang) }}
+      </button>
+      <input type="date" name="week" id="cal-jump" value="{{ week }}"
+        onchange="this.form.submit()" tabindex="-1" aria-hidden="true"
+        class="pointer-events-none absolute inset-0 -z-10 opacity-0">
+    </form>
     {% endif %}
   </div>
   <div class="text-sm font-medium opacity-60">{{ court_name }} · {{ week_label }}</div>
@@ -190,5 +209,22 @@
     });
   })();
 </script>
+<script>
+  // "Go to week" — open the native date picker; picking any day loads the
+  // week it belongs to. Admin only.
+  (function () {
+    var btn = document.getElementById('cal-jump-btn');
+    var input = document.getElementById('cal-jump');
+    if (!btn || !input) return;
+    btn.addEventListener('click', function () {
+      if (typeof input.showPicker === 'function') {
+        input.showPicker();
+      } else {
+        input.focus();
+        input.click();
+      }
+    });
+  })();
+</script>
 {% endif %}
 {% endblock js %}
diff --git a/ht_booking/src/controllers/calendar.rs b/ht_booking/src/controllers/calendar.rs
index 27f94b9..3dfd478 100644
--- a/ht_booking/src/controllers/calendar.rs
+++ b/ht_booking/src/controllers/calendar.rs
@@ -86,6 +86,9 @@ pub struct CalendarPage {
     pub prev_week: String,
     pub this_week: String,
     pub next_week: String,
+    /// `false` on the public calendar once it reaches the two-week look-back
+    /// limit, which disables the "previous week" button. Always `true` for admin.
+    pub can_prev: bool,
     pub days: Vec<DayHead>,
     pub rows: Vec<Row>,
 }
@@ -185,6 +188,10 @@ pub async fn build_calendar(
         .unwrap_or_default();
 
     let monday = week_monday(q_week.as_deref());
+    // The public calendar may look back at most two weeks; the admin has no limit.
+    let min_monday = monday_of(Utc::now().date_naive()) - Duration::weeks(2);
+    let monday = if is_admin { monday } else { monday.max(min_monday) };
+    let can_prev = is_admin || monday > min_monday;
     let sunday = monday + Duration::days(6);
 
     let days: Vec<DayHead> = (0..7i64)
@@ -269,6 +276,7 @@ pub async fn build_calendar(
             .format("%Y-%m-%d")
             .to_string(),
         next_week: (monday + Duration::days(7)).format("%Y-%m-%d").to_string(),
+        can_prev,
         days,
         rows,
     })