diff --git a/src/main/java/envoy/client/ui/controller/ChatScene.java b/src/main/java/envoy/client/ui/controller/ChatScene.java
index 1c626b2..b2ae0ef 100644
--- a/src/main/java/envoy/client/ui/controller/ChatScene.java
+++ b/src/main/java/envoy/client/ui/controller/ChatScene.java
@@ -139,6 +139,7 @@ public final class ChatScene implements Restorable {
 				Platform.runLater(() -> {
 					userList.getItems().remove(chat);
 					userList.getItems().add(0, chat);
+					if (chat.equals(currentChat)) userList.getSelectionModel().select(0);
 					localDB.getChats().remove(chat);
 					localDB.getChats().add(0, chat);
 				});