diff --git a/assets/js/dashboard.js b/assets/js/dashboard.js
index cd70508..608829c 100644
--- a/assets/js/dashboard.js
+++ b/assets/js/dashboard.js
@@ -411,25 +411,21 @@ document.addEventListener('DOMContentLoaded', function() {
 function toggleHamburgerEditMode() {
     const editButton = document.getElementById('hamburgerEditButton');
     const editables = document.querySelectorAll('.hamburger-content .editable');
-    const isEditing = editButton.classList.contains('active');
+    const isEditing = editButton.classList.contains('editing'); // Use a dedicated class
 
     if (!isEditing) {
         editButton.textContent = 'Save Changes';
-        editButton.onclick = saveHamburgerChanges; // Change onclick to save
-        editButton.classList.add('active');
+        editButton.classList.add('editing'); // Add the class
         editables.forEach(field => field.disabled = false);
 
-        // Add cancel button
         const cancelButton = document.createElement('button');
         cancelButton.id = 'hamburgerCancelButton';
         cancelButton.className = 'btn';
         cancelButton.textContent = 'Cancel';
         cancelButton.onclick = cancelHamburgerEdit;
         editButton.parentNode.appendChild(cancelButton);
-
-
     } else {
-        // This part shouldn't be reached with the new onclick handler
+        saveHamburgerChanges(); // Directly call save on second click
     }
 }
 
@@ -517,16 +513,16 @@ function createHamburgerMenu() {
                     </select>
                 </div>
                 <div class="menu-controls">
-                    <button id="hamburgerEditButton" class="btn primary" onclick="toggleHamburgerEditMode()">Edit Ticket</button>
+                    <button id="hamburgerEditButton" class="btn primary">Edit Ticket</button>
                 </div>
-                // Add event listener for Escape key press
-                document.addEventListener('keydown', (event) => {
-                    if (event.key === 'Escape') {
-                        cancelHamburgerEdit();
-                    }
-                });
             </div>
         `;
+        // Add event listener for Escape key press
+        document.addEventListener('keydown', (event) => {
+            if (event.key === 'Escape') {
+                cancelHamburgerEdit();
+            }
+        });
     } else {
         hamburgerMenu.innerHTML = `
             <div class="hamburger-icon">☰</div>