diff --git a/app.js b/app.js
index 727c2a5..3e0eea3 100644
--- a/app.js
+++ b/app.js
@@ -759,6 +759,28 @@ class TeeTracker {
                 this.switchTab(button.dataset.tab);
             });
         });
+
+        // Event delegation for tea card buttons (edit and delete)
+        const teasList = document.getElementById('teas-list');
+        if (teasList) {
+            teasList.addEventListener('click', (e) => {
+                // Edit button
+                const editBtn = e.target.closest('.tea-edit-btn');
+                if (editBtn) {
+                    const teaId = editBtn.dataset.teaId;
+                    if (teaId) this.editTea(teaId);
+                    return;
+                }
+                
+                // Delete button
+                const deleteBtn = e.target.closest('.tea-delete-btn');
+                if (deleteBtn) {
+                    const teaId = deleteBtn.dataset.teaId;
+                    if (teaId) this.showDeleteTeaConfirm(teaId);
+                    return;
+                }
+            });
+        }
         
         // Add tea button
         const addTeaBtn = document.getElementById('add-tea-btn');
@@ -1394,27 +1416,6 @@ class TeeTracker {
                 </div>
             </div>
         `).join('');
-        
-        // Add event listeners to all edit and delete buttons
-        this.setupTeaCardEventListeners();
-    }
-    
-    setupTeaCardEventListeners() {
-        // Edit buttons
-        document.querySelectorAll('.tea-edit-btn').forEach(btn => {
-            btn.addEventListener('click', (e) => {
-                const teaId = e.target.closest('.tea-edit-btn').dataset.teaId;
-                if (teaId) this.editTea(teaId);
-            });
-        });
-        
-        // Delete buttons
-        document.querySelectorAll('.tea-delete-btn').forEach(btn => {
-            btn.addEventListener('click', (e) => {
-                const teaId = e.target.closest('.tea-delete-btn').dataset.teaId;
-                if (teaId) this.showDeleteTeaConfirm(teaId);
-            });
-        });
     }
     
     // ============================================