diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index 3a069d9..6916dda 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -12,7 +12,8 @@
       "Bash(npm install:*)",
       "WebFetch(domain:raw.githubusercontent.com)",
       "Bash(npm run css:analyze:*)",
-      "Bash(npm run test:run:*)"
+      "Bash(npm run test:run:*)",
+      "Bash(cd:*)"
     ],
     "deny": [],
     "ask": []
diff --git a/src/v2/features/headerdrawer/HeaderDrawerRenderer.ts b/src/v2/features/headerdrawer/HeaderDrawerRenderer.ts
index 6eaa6f7..1b528cd 100644
--- a/src/v2/features/headerdrawer/HeaderDrawerRenderer.ts
+++ b/src/v2/features/headerdrawer/HeaderDrawerRenderer.ts
@@ -384,12 +384,14 @@ export class HeaderDrawerRenderer {
 
   /**
    * Get visible column keys from DOM (preserves order for multi-resource views)
+   * Uses filterTemplate.buildKeyFromColumn() for consistent key format with events
    */
   private getVisibleColumnKeysFromDOM(): string[] {
+    if (!this.filterTemplate) return [];
     const columns = document.querySelectorAll('swp-day-column');
     const columnKeys: string[] = [];
     columns.forEach(col => {
-      const columnKey = (col as HTMLElement).dataset.columnKey;
+      const columnKey = this.filterTemplate!.buildKeyFromColumn(col as HTMLElement);
       if (columnKey) columnKeys.push(columnKey);
     });
     return columnKeys;