diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 5ee9b006..82069d65 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -103,7 +103,8 @@ function initCallbacks() {
         if($("#messagebuffer").children().length > 100) {
             $($("#messagebufer").children()[0]).remove();
         }
-        $("#messagebuffer").scrollTop($("#messagebuffer").prop("scrollHeight"));
+        if(SCROLLCHAT)
+            $("#messagebuffer").scrollTop($("#messagebuffer").prop("scrollHeight"));
     });
 
     socket.on("playlist", function(data) {
@@ -298,6 +299,9 @@ function initCallbacks() {
 
     socket.on("newPoll", function(data) {
         addPoll(data);
+        if(SCROLLCHAT) {
+            $("#messagebuffer").scrollTop($("#messagebuffer").prop("scrollHeight"));
+        }
     });
 
     socket.on("updatePoll", function(data) {
diff --git a/www/assets/js/client.js b/www/assets/js/client.js
index 43dd4802..b4329d4a 100644
--- a/www/assets/js/client.js
+++ b/www/assets/js/client.js
@@ -22,6 +22,7 @@ var OLDINDEX = -1;
 var CHATHIST = [];
 var CHATHISTIDX = 0;
 var FOCUSED = true;
+var SCROLLCHAT = true;
 var PAGETITLE = "Sync";
 var TITLE_BLINK;
 var uname = readCookie("sync_uname");
@@ -254,6 +255,9 @@ $("#chatline").keydown(function(ev) {
     }
 });
 
+$("#messagebuffer").mouseenter(function() { SCROLLCHAT = false; });
+$("#messagebuffer").mouseleave(function() { SCROLLCHAT = true; });
+
 $("#opt_submit").click(function() {
     var ptitle = $("#opt_pagetitle").val();
     if(ptitle == "")