diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index 47b0ae3ca..b2a7d2737 100644
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -62,8 +62,11 @@ var chat = (function()
     },
     scrollDown: function()
     {
-      if($('#chatbox').css("display") != "none")
-        $('#chattext').animate({scrollTop: $('#chattext')[0].scrollHeight}, "slow");
+      if($('#options-scrollchat').is(':checked')){
+        if($('#chatbox').css("display") != "none"){
+          $('#chattext').animate({scrollTop: $('#chattext')[0].scrollHeight}, "slow");
+        }
+      }
     }, 
     send: function()
     {
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 02af9b107..a25133472 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -168,6 +168,10 @@
                     <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">