diff --git a/Chat.go b/Chat.go
index d54c19e..afd10b4 100644
--- a/Chat.go
+++ b/Chat.go
@@ -932,7 +932,7 @@ func ArchiveDefaultConversationHandler(c *fiber.Ctx) error {
 		UPDATE Conversation
 		FILTER .user = global currentUser AND .name = 'Default'
 		SET {
-			name = <str>$0
+			name := <str>$0
 		};
 	`, name)
 	if err != nil {
@@ -957,5 +957,5 @@ func ArchiveDefaultConversationHandler(c *fiber.Ctx) error {
 		panic(err)
 	}
 
-	return c.SendString(generateChatHTML())
+	return c.SendString(GenerateConversationPopoverHTML(true))
 }
diff --git a/views/partials/popover-conversation.html b/views/partials/popover-conversation.html
index ce58f8c..92816c3 100644
--- a/views/partials/popover-conversation.html
+++ b/views/partials/popover-conversation.html
@@ -23,16 +23,16 @@
                 </div>
                 <input class="input is-small mt-2 is-hidden" type="text" id="conversation-name-input"
                     name="conversation-name-input" placeholder="Conversation name" autocomplete="off">
-                <div
-                    class="is-flex is-justify-content-space-between mt-4 {% if not IsDefaultConversation %}is-hidden{% endif %}">
-                    <button disabled class="button is-small is-danger" id="delete-conversation-button"
-                        hx-get="/deleteConversation" hx-swap="outerHTML" hx-target="#conversation-dropdown"
-                        hx-vals="js:{conversationId: findSelectedConversationID()}">
+                <div class="is-flex is-justify-content-space-between mt-4 ">
+                    <button class="button is-small is-danger {% if SelectedIsDefault %} is-hidden {% endif %}"
+                        id="delete-conversation-button" hx-get="/deleteConversation" hx-swap="outerHTML"
+                        hx-target="#conversation-dropdown" hx-vals="js:{conversationId: findSelectedConversationID()}">
                         <span class="icon">
                             <i class="fa-solid fa-trash"></i>
                         </span>
                     </button>
-                    <button class="button is-small is-info is-outlined {% if SelectedIsDefault %} is-hidden {% endif %}"
+                    <button
+                        class="button is-small is-info is-outlined {% if not SelectedIsDefault %} is-hidden {% endif %}"
                         id="archive-default-conversation-button">
                         <span class="icon">
                             <i class="fa-solid fa-box-archive"></i>
@@ -59,7 +59,7 @@
                             </span>
                         </button>
                         <button class="button is-small is-success is-outlined is-hidden"
-                            id="confirm-archive-default-conversation-button" hx-get="/archiveDefaultConversation"
+                            id="confirm-archive-default-conversation-button" hx-post="/archiveDefaultConversation"
                             hx-include="[name='conversation-name-input']" hx-swap="outerHTML"
                             hx-target="#conversation-dropdown">
                             <span class="icon">
@@ -151,13 +151,23 @@
         })
 
         document.getElementById('cancel-conversation-button').addEventListener('click', function () {
+
             document.getElementById('conversation-name-input').classList.add('is-hidden');
             document.getElementById('confirm-conversation-button').classList.add('is-hidden');
             document.getElementById('create-conversation-button').classList.remove('is-hidden');
             document.getElementById('cancel-conversation-button').classList.add('is-hidden');
-            document.getElementById('delete-conversation-button').classList.remove('is-hidden');
             document.getElementById('conversation-list').classList.remove('is-hidden');
-            document.getElementById('archive-default-conversation-button').classList.add('is-hidden');
+
+            // If the selected is the default conversation
+            if (document.getElementsByClassName('selected icon-conv')[0].getAttribute('data-id') === 'default') {
+                document.getElementById('delete-conversation-button').classList.add('is-hidden');
+                document.getElementById('archive-default-conversation-button').classList.remove('is-hidden');
+                document.getElementById('confirm-archive-default-conversation-button').classList.remove('is-hidden');
+            } else {
+                document.getElementById('delete-conversation-button').classList.remove('is-hidden');
+                document.getElementById('archive-default-conversation-button').classList.add('is-hidden');
+                document.getElementById('confirm-archive-default-conversation-button').classList.add('is-hidden');
+            }
         })
     </script>
 </div>
\ No newline at end of file