diff --git a/IPython/html/static/notebook/js/outputarea.js b/IPython/html/static/notebook/js/outputarea.js
index 41463a169..7523389af 100644
--- a/IPython/html/static/notebook/js/outputarea.js
+++ b/IPython/html/static/notebook/js/outputarea.js
@@ -188,7 +188,7 @@ define([
 
     OutputArea.prototype.toggle_scroll = function () {
         if (this.scroll_state == 'auto') {
-            this.scroll_state = false;
+            this.scroll_state = !this.scrolled;
         } else {
             this.scroll_state = !this.scroll_state;
         }