diff --git a/src/chatty-window.c b/src/chatty-window.c
index e2ed9256d91b685864526f34d66ea90e5174ae9f..9cc37095e37ceb44b0d356a003259bfc7515b5ab 100644
--- a/src/chatty-window.c
+++ b/src/chatty-window.c
@@ -495,7 +495,8 @@ window_delete_buddy_clicked_cb (ChattyWindow *self)
     }
 
     window_set_item (self, NULL);
-    chatty_window_chat_list_select_first (self);
+    if (!hdy_leaflet_get_folded (HDY_LEAFLET (self->content_box)))
+      chatty_window_chat_list_select_first (self);
   }
 
   gtk_widget_destroy (dialog);