diff --git a/src/main/java/fr/insa/clavardator/ui/chat/ChatController.java b/src/main/java/fr/insa/clavardator/ui/chat/ChatController.java
index d8e18f0..addb641 100644
--- a/src/main/java/fr/insa/clavardator/ui/chat/ChatController.java
+++ b/src/main/java/fr/insa/clavardator/ui/chat/ChatController.java
@@ -67,8 +67,10 @@ public class ChatController implements Initializable {
 
 	private void onMessageAdded(PeerUser user, Message message) {
 		Log.v(this.getClass().getSimpleName(), "Message added: " + message.getText());
-		messageList.getItems().add(message);
-		Platform.runLater(() -> messageList.scrollTo(messageList.getItems().size() - 1));
+		Platform.runLater(() -> {
+			messageList.getItems().add(message);
+			messageList.scrollTo(messageList.getItems().size() - 1);
+		});
 	}
 
 	private void setState(State state) {