diff --git a/src/main/java/seng302/visualiser/controllers/RaceViewController.java b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
index a50f5d89..5c4e2257 100644
--- a/src/main/java/seng302/visualiser/controllers/RaceViewController.java
+++ b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
@@ -11,6 +11,8 @@ import javafx.animation.Timeline;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
@@ -123,6 +125,9 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                 chatInput.setText(chatInput.getText().substring(0, CHAT_LIMIT));
             }
         });
+        chatHistory.textProperty().addListener((obs, oldValue, newValue) -> {
+            chatHistory.setScrollTop(Double.MAX_VALUE);
+        });
     }
 
     public void loadRace (
@@ -657,7 +662,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     }
 
     public void updateChatHistory(Paint playerColour, String newMessage) {
-        chatHistory.setText(chatHistory.getText() + newMessage + '\n');
+        chatHistory.appendText(newMessage + '\n');
     }
 
 }
\ No newline at end of file