diff --git a/src/chatty-chat-view.c b/src/chatty-chat-view.c
index 56c9a99baffe026a1725fde7eb816678f9cafe20..7b820f808cd4304d2ce8c82657bff8d2f056b1a0 100644
--- a/src/chatty-chat-view.c
+++ b/src/chatty-chat-view.c
@@ -716,11 +716,18 @@ chatty_chat_view_set_chat (ChattyChatView *self,
     g_clear_object (&self->history_binding);
   }
 
+  gtk_widget_set_sensitive (self->message_input, !!chat);
+  gtk_widget_set_visible (self->empty_view, !!chat);
+  gtk_widget_set_visible (self->empty_view, !!chat);
+
   if (!g_set_object (&self->chat, chat))
     return;
 
-  if (!chat)
+  if (!chat) {
+    gtk_list_box_bind_model (GTK_LIST_BOX (self->message_list),
+                             NULL, NULL, NULL, NULL);
     return;
+  }
 
   messages = chatty_chat_get_messages (chat);
   account = chatty_chat_get_account (chat);
diff --git a/src/chatty-window.c b/src/chatty-window.c
index 9cc37095e37ceb44b0d356a003259bfc7515b5ab..ad417a43b625e08cf61a214136b92df00696c97e 100644
--- a/src/chatty-window.c
+++ b/src/chatty-window.c
@@ -495,6 +495,10 @@ window_delete_buddy_clicked_cb (ChattyWindow *self)
     }
 
     window_set_item (self, NULL);
+    gtk_widget_hide (self->call_button);
+    gtk_widget_set_sensitive (self->header_sub_menu_button, FALSE);
+    chatty_chat_view_set_chat (CHATTY_CHAT_VIEW (self->chat_view), NULL);
+
     if (!hdy_leaflet_get_folded (HDY_LEAFLET (self->content_box)))
       chatty_window_chat_list_select_first (self);
   }
diff --git a/src/ui/chatty-chat-view.ui b/src/ui/chatty-chat-view.ui
index 924449fd59d93fdc55e5670a500594653755a5d9..495fd2711b3ecb8054ffe2457ed3b63e45ca4199 100644
--- a/src/ui/chatty-chat-view.ui
+++ b/src/ui/chatty-chat-view.ui
@@ -160,6 +160,7 @@
                         <property name="visible">True</property>
                         <property name="hexpand">True</property>
                         <property name="valign">center</property>
+                        <property name="sensitive">False</property>
                         <property name="wrap-mode">GTK_WRAP_WORD_CHAR</property>
                         <property name="buffer">message_input_buffer</property>
                         <signal name="focus-in-event" handler="chat_view_input_focus_in_cb" swapped="yes"/>