diff --git a/popup.html b/popup.html
index b056a73..7ee3313 100644
--- a/popup.html
+++ b/popup.html
@@ -25,6 +25,7 @@ <h3>Slacktack</h3>
             <input type="text" id="new-name" placeholder="Custom Name">
         </div>
         <button id="save">Save</button>
+        <button id="clear-all">Clear All Tacks</button>
         <div id="message"></div>
     </div>
     <script src="popup.js"></script>
diff --git a/popup.js b/popup.js
index e61afac..fa0db99 100644
--- a/popup.js
+++ b/popup.js
@@ -1,29 +1,41 @@
-// popup.js
+// Handle the "Save" button click event
+document.getElementById("save").addEventListener("click", () => {
+  const originalName = document.getElementById("original-name").value.trim();
+  const newName = document.getElementById("new-name").value.trim();
+  const messageElement = document.getElementById("message");
 
-document.getElementById('save').addEventListener('click', () => {
-    const originalName = document.getElementById('original-name').value.trim();
-    const newName = document.getElementById('new-name').value.trim();
-    const messageElement = document.getElementById('message');
+  if (originalName && newName) {
+    // Get existing overrides from storage
+    chrome.storage.sync.get("chatRoomOverrides", (data) => {
+      const overrides = data.chatRoomOverrides || {};
+      overrides[originalName] = newName;
 
-    if (originalName && newName) {
-        // Get existing overrides from storage
-        chrome.storage.sync.get('chatRoomOverrides', (data) => {
-            const overrides = data.chatRoomOverrides || {};
-            overrides[originalName] = newName;
+      // Save the new override
+      chrome.storage.sync.set({ chatRoomOverrides: overrides }, () => {
+        messageElement.textContent = "Name override saved!";
+        messageElement.style.color = "#b8bb26"; // Gruvbox green
 
-            // Save the new override
-            chrome.storage.sync.set({ chatRoomOverrides: overrides }, () => {
-                messageElement.textContent = 'Name override saved!';
-                messageElement.style.color = '#b8bb26'; // Gruvbox green
+        // Clear input fields
+        document.getElementById("original-name").value = "";
+        document.getElementById("new-name").value = "";
+      });
+    });
+  } else {
+    // Show error message
+    messageElement.textContent = "Please fill out both fields.";
+    messageElement.style.color = "#fb4934"; // Gruvbox red
+  }
+});
 
-                // Clear input fields
-                document.getElementById('original-name').value = '';
-                document.getElementById('new-name').value = '';
-            });
-        });
-    } else {
-        // Show error message
-        messageElement.textContent = 'Please fill out both fields.';
-        messageElement.style.color = '#fb4934'; // Gruvbox red
-    }
+// Handle the "Clear All Tacks" button click event
+document.getElementById("clear-all").addEventListener("click", () => {
+  // Confirm with the user before clearing
+  if (window.confirm("Are you sure you want to clear all tacks?")) {
+    // Clear all overrides from storage
+    chrome.storage.sync.remove("chatRoomOverrides", () => {
+      const messageElement = document.getElementById("message");
+      messageElement.textContent = "All tacks have been cleared!";
+      messageElement.style.color = "#b8bb26"; // Gruvbox green
+    });
+  }
 });