diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index 279ce7b4..2d60f73f 100755
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -89,7 +89,7 @@ var chat = (function()
     scrollDown: function()
     {
       if($('.chat-content').is(':visible')){
-        if(!self.lastMessage || !self.lastMessage.position() || self.lastMessage.position().top < $('#chattext').height()) {
+        if(!self.lastMessage || !self.lastMessage.position() || self.lastMessage.position().top < ($('#chattext').outerHeight() + 20)) {
           // if we use a slow animate here we can have a race condition when a users focus can not be moved away
           // from the last message recieved.
           $('#chattext').animate({scrollTop: $('#chattext')[0].scrollHeight}, { duration: 400, queue: false });
diff --git a/src/static/skins/colibris/src/components/chat.css b/src/static/skins/colibris/src/components/chat.css
index 14c645ec..90c06c38 100644
--- a/src/static/skins/colibris/src/components/chat.css
+++ b/src/static/skins/colibris/src/components/chat.css
@@ -1,5 +1,6 @@
 #chatbox {
   background-color: transparent !important;
+  color: var(--text-color);
 }
 .chat-content {
   background: none;