diff --git a/frontend/components/time-tracking/TimeTrackingCalendar.vue b/frontend/components/time-tracking/TimeTrackingCalendar.vue
index c4fba42..7961d9e 100644
--- a/frontend/components/time-tracking/TimeTrackingCalendar.vue
+++ b/frontend/components/time-tracking/TimeTrackingCalendar.vue
@@ -1,7 +1,10 @@
 <template>
-    <div ref="calendarEl" class="relative overflow-auto rounded-lg border border-neutral-200 bg-white" style="max-height: calc(100vh - 280px);">
+    <div ref="calendarEl" class="relative rounded-lg border border-neutral-200 bg-white">
         <!-- Day headers -->
-        <div class="sticky top-0 z-20 flex border-b border-neutral-200 bg-white">
+        <div
+            class="sticky z-20 flex border-b border-neutral-200 bg-white"
+            :style="{ top: `${stickyOffset}px` }"
+        >
             <div class="w-16 shrink-0 border-r border-neutral-200" />
             <div
                 v-for="day in days"
@@ -131,6 +134,7 @@ const props = defineProps<{
     entries: TimeEntry[]
     startDate: Date
     viewMode: 'week' | 'day'
+    stickyOffset?: number
 }>()
 
 const emit = defineEmits<{
@@ -148,15 +152,28 @@ const dayLabels = ['Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam']
 const calendarEl = ref<HTMLElement | null>(null)
 const gridBodyEl = ref<HTMLElement | null>(null)
 const dayColumnEls = ref<HTMLElement[]>([])
+const stickyOffset = computed(() => props.stickyOffset ?? 0)
+
+function getScrollParent(): HTMLElement | null {
+    let el = calendarEl.value?.parentElement
+    while (el) {
+        if (el.scrollHeight > el.clientHeight && getComputedStyle(el).overflowY !== 'visible') return el
+        el = el.parentElement
+    }
+    return null
+}
 
 // Scroll to current hour on mount
 onMounted(() => {
     nextTick(() => {
         if (!calendarEl.value) return
+        const scrollParent = getScrollParent()
+        if (!scrollParent) return
         const now = new Date()
         const currentMinutes = now.getHours() * 60 + now.getMinutes()
-        const scrollTarget = (currentMinutes / 60) * hourHeight - calendarEl.value.clientHeight / 3
-        calendarEl.value.scrollTop = Math.max(0, scrollTarget)
+        const calendarTop = calendarEl.value.offsetTop
+        const scrollTarget = calendarTop + (currentMinutes / 60) * hourHeight - scrollParent.clientHeight / 3
+        scrollParent.scrollTop = Math.max(0, scrollTarget)
     })
 })
 
@@ -470,12 +487,13 @@ function onDragMove(event: MouseEvent) {
 }
 
 function autoScrollLoop() {
-    if (!autoScrollActive || !lastMouseEvent || !calendarEl.value || !dragState.value) {
+    const scrollParent = getScrollParent()
+    if (!autoScrollActive || !lastMouseEvent || !scrollParent || !dragState.value) {
         autoScrollActive = false
         return
     }
 
-    const rect = calendarEl.value.getBoundingClientRect()
+    const rect = scrollParent.getBoundingClientRect()
     const edgeSize = 60
     const maxSpeed = 10
 
@@ -484,10 +502,10 @@ function autoScrollLoop() {
 
     let scrolled = false
     if (distFromTop < edgeSize && distFromTop > 0) {
-        calendarEl.value.scrollTop -= maxSpeed * (1 - distFromTop / edgeSize)
+        scrollParent.scrollTop -= maxSpeed * (1 - distFromTop / edgeSize)
         scrolled = true
     } else if (distFromBottom < edgeSize && distFromBottom > 0) {
-        calendarEl.value.scrollTop += maxSpeed * (1 - distFromBottom / edgeSize)
+        scrollParent.scrollTop += maxSpeed * (1 - distFromBottom / edgeSize)
         scrolled = true
     }
 
diff --git a/frontend/layouts/default.vue b/frontend/layouts/default.vue
index c1028ac..1f2acff 100644
--- a/frontend/layouts/default.vue
+++ b/frontend/layouts/default.vue
@@ -98,9 +98,12 @@
 
             <div class="h-full flex-1 overflow-hidden flex flex-col">
                 <AppTopNav :user="auth.user" />
-                <main class="flex-1 overflow-y-auto px-16 py-24">
-                    <slot/>
-                </main>
+                <div class="relative flex-1 overflow-hidden bg-white">
+                    <div aria-hidden="true" class="pointer-events-none absolute inset-x-0 top-0 z-50 h-12 bg-white" />
+                    <main class="h-full overflow-y-auto px-16 pt-12 pb-24">
+                        <slot/>
+                    </main>
+                </div>
             </div>
         </div>
 
diff --git a/frontend/pages/time-tracking.vue b/frontend/pages/time-tracking.vue
index 7266a1a..1a07758 100644
--- a/frontend/pages/time-tracking.vue
+++ b/frontend/pages/time-tracking.vue
@@ -1,16 +1,17 @@
 <template>
     <div>
-        <div class="flex items-center justify-between">
-            <h1 class="text-2xl font-bold text-primary-500">Suivi des temps</h1>
-            <button
-                class="rounded-md bg-primary-500 px-4 py-2 text-sm font-semibold text-white hover:bg-primary-600 transition"
-                @click="openCreateDrawer()"
-            >
-                + Ajouter une Activité
-            </button>
-        </div>
+        <div ref="pageHeaderEl" class="sticky top-0 z-40 bg-white pb-4">
+            <div class="flex items-center justify-between">
+                <h1 class="text-2xl font-bold text-primary-500">Suivi des temps</h1>
+                <button
+                    class="rounded-md bg-primary-500 px-4 py-2 text-sm font-semibold text-white hover:bg-primary-600 transition"
+                    @click="openCreateDrawer()"
+                >
+                    + Ajouter une Activité
+                </button>
+            </div>
 
-        <div class="relative z-30 mt-4 flex items-center gap-4">
+            <div class="relative z-30 mt-4 flex items-center gap-4">
             <h2 class="text-lg font-bold text-orange-500">
                 {{ currentMonthLabel }}
             </h2>
@@ -62,6 +63,7 @@
                 text-field="text-sm"
                 text-value="text-sm"
             />
+            </div>
         </div>
 
         <div class="mt-4">
@@ -76,6 +78,7 @@
                 :entries="filteredEntries"
                 :start-date="startDate"
                 :view-mode="viewMode"
+                :sticky-offset="pageHeaderHeight"
                 @edit-entry="openEditDrawer"
                 @create-entry="openCreateDrawer"
                 @move-entry="onMoveEntry"
@@ -136,6 +139,8 @@ const drawerOpen = ref(false)
 const editingEntry = ref<TimeEntry | null>(null)
 const prefillStartedAt = ref<string | null>(null)
 const clipboard = ref<TimeEntry | null>(null)
+const pageHeaderEl = ref<HTMLElement | null>(null)
+const pageHeaderHeight = ref(0)
 
 const contextMenu = reactive({
     visible: false,
@@ -163,6 +168,12 @@ const typeOptions = computed(() =>
     types.value.map(t => ({ label: t.label, value: t.id }))
 )
 
+let pageHeaderResizeObserver: ResizeObserver | null = null
+
+function updatePageHeaderHeight() {
+    pageHeaderHeight.value = pageHeaderEl.value?.offsetHeight ?? 0
+}
+
 const filteredEntries = computed(() => {
     let result = entries.value
     if (selectedProjectId.value) {
@@ -263,6 +274,24 @@ async function onPaste() {
     await loadEntries()
 }
 
+onMounted(() => {
+    updatePageHeaderHeight()
+
+    if (!pageHeaderEl.value || typeof ResizeObserver === 'undefined') {
+        return
+    }
+
+    pageHeaderResizeObserver = new ResizeObserver(() => {
+        updatePageHeaderHeight()
+    })
+    pageHeaderResizeObserver.observe(pageHeaderEl.value)
+})
+
+onBeforeUnmount(() => {
+    pageHeaderResizeObserver?.disconnect()
+})
+
+
 async function onDelete(entry: TimeEntry) {
     await timeEntryService.remove(entry.id)
     await loadEntries()