diff --git a/src/managers/HeaderManager.ts b/src/managers/HeaderManager.ts
index cd12fc0..c3c1dec 100644
--- a/src/managers/HeaderManager.ts
+++ b/src/managers/HeaderManager.ts
@@ -47,9 +47,6 @@ export class HeaderManager {
     const calendarHeader = this.getCalendarHeader();
     if (!calendarHeader) return;
 
-    // Clean up existing listeners first
-    this.removeEventListeners();
-
     // Throttle for better performance
     let lastEmitTime = 0;
     const throttleDelay = 16; // ~60fps
@@ -142,6 +139,9 @@ export class HeaderManager {
     const calendarHeader = this.getOrCreateCalendarHeader();
     if (!calendarHeader) return;
 
+    // Remove existing event listeners BEFORE clearing content
+    this.removeEventListeners();
+
     // Clear existing content
     calendarHeader.innerHTML = '';
 
@@ -157,7 +157,7 @@ export class HeaderManager {
 
     headerRenderer.render(calendarHeader, context);
 
-    // Re-setup event listeners
+    // Setup event listeners on the new content
     this.setupHeaderDragListeners();
 
     // Notify other managers that header was rebuilt