2 files changed, 1 insertions, 2 deletions
diff --git a/main/src/ui/conversation_selector/conversation_selector.vala b/main/src/ui/conversation_selector/conversation_selector.vala
index 66cb3495..869f6403 100644
--- a/main/src/ui/conversation_selector/conversation_selector.vala
+++ b/main/src/ui/conversation_selector/conversation_selector.vala
@@ -93,7 +93,7 @@ public class ConversationSelector : ListBox {
 
     private void remove_conversation(Conversation conversation) {
         select_fallback_conversation(conversation);
-        if (rows.has_key(conversation) && !conversation.active) {
+        if (rows.has_key(conversation)) {
             remove(rows[conversation]);
             rows.unset(conversation);
         }
diff --git a/main/src/ui/manage_accounts/dialog.vala b/main/src/ui/manage_accounts/dialog.vala
index bb0614a2..e605e083 100644
--- a/main/src/ui/manage_accounts/dialog.vala
+++ b/main/src/ui/manage_accounts/dialog.vala
@@ -173,7 +173,6 @@ public class Dialog : Gtk.Dialog {
     private bool change_account_state(bool state) {
         selected_account.enabled = state;
         if (state) {
-            if (selected_account.enabled) account_disabled(selected_account);
             account_enabled(selected_account);
         } else {
             account_disabled(selected_account);