diff --git a/dist/index.js b/dist/index.js
index 494501c1..1b75b290 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -673,8 +673,8 @@
   var mailboxId = restoreState("mailbox-id", "");
   var isMailboxActive = new State(false);
   var cannotDeleteMailbox = createProxyState(
-    [mailboxId, isMailboxActive],
-    () => mailboxId.value == "" || isMailboxActive.value == false
+    [mailboxId, isMailboxActive, isConnected],
+    () => mailboxId.value == "" || isMailboxActive.value == false || isConnected.value == false
   );
   var cannotRequestMailbox = createProxyState(
     [isConnected, isMailboxActive],
@@ -879,6 +879,7 @@
     function deleteChat() {
       chat.deleteSelf();
       closeModal();
+      closeChatView();
     }
     const shouldShowKey = new State(false);
     const inputType = createProxyState(
diff --git a/src/Model/model.ts b/src/Model/model.ts
index 69721189..96608a56 100644
--- a/src/Model/model.ts
+++ b/src/Model/model.ts
@@ -87,8 +87,11 @@ export const mailboxId = React.restoreState("mailbox-id", "");
 export const isMailboxActive = new React.State(false);
 
 export const cannotDeleteMailbox = React.createProxyState(
-  [mailboxId, isMailboxActive],
-  () => mailboxId.value == "" || isMailboxActive.value == false
+  [mailboxId, isMailboxActive, isConnected],
+  () =>
+    mailboxId.value == "" ||
+    isMailboxActive.value == false ||
+    isConnected.value == false
 );
 export const cannotRequestMailbox = React.createProxyState(
   [isConnected, isMailboxActive],