diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index b2a7d273..18904352 100644
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -62,9 +62,10 @@ var chat = (function()
     },
     scrollDown: function()
     {
-      if($('#options-scrollchat').is(':checked')){
-        if($('#chatbox').css("display") != "none"){
+      if($('#chatbox').css("display") != "none"){
+        if(!self.lastMessage || !self.lastMessage.position() || self.lastMessage.position().top < $('#chattext').height()) {
           $('#chattext').animate({scrollTop: $('#chattext')[0].scrollHeight}, "slow");
+          self.lastMessage = $('#chattext > p').eq(-1);
         }
       }
     }, 
diff --git a/src/templates/pad.html b/src/templates/pad.html
index a2513347..02af9b10 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -168,10 +168,6 @@
                     <input type="checkbox" id="options-linenoscheck" checked>
                     <label for="options-linenoscheck">Line numbers</label>
                 </p>
-                <p>
-                    <input type="checkbox" id="options-scrollchat" checked>
-                    <label for="options-scrollchat">Automatically Scroll Chat</label>
-                </p>
                 <p>
                     Font type:
                     <select id="viewfontmenu">