diff --git a/octoprint/static/js/ui.js b/octoprint/static/js/ui.js
index 1fe7aa8..7b34c4f 100644
--- a/octoprint/static/js/ui.js
+++ b/octoprint/static/js/ui.js
@@ -396,6 +396,8 @@ function TerminalViewModel() {
     self.isReady = ko.observable(undefined);
     self.isLoading = ko.observable(undefined);
 
+    self.autoscrollEnabled = ko.observable(true);
+
     self.fromCurrentData = function(data) {
         self._processStateData(data.state);
         self._processCurrentLogData(data.logs);
@@ -438,11 +440,9 @@ function TerminalViewModel() {
         }
 
         var container = $("#terminal-output");
-        var autoscroll = (container.scrollTop() == container[0].scrollHeight - container.height);
-
         container.text(output);
 
-        if (autoscroll) {
+        if (self.autoscrollEnabled()) {
             container.scrollTop(container[0].scrollHeight - container.height())
         }
     }
diff --git a/octoprint/templates/index.html b/octoprint/templates/index.html
index ef1cd16..1fc7637 100644
--- a/octoprint/templates/index.html
+++ b/octoprint/templates/index.html
@@ -219,6 +219,10 @@
                         </div>
                         <div class="tab-pane" id="term">
                             <pre id="terminal-output" class="pre-scrollable"></pre>
+                            <label class="checkbox">
+                                <input type="checkbox" id="terminal-autoscroll" data-bind="checked: autoscrollEnabled"> Autoscroll
+                            </label>
+
                             <div class="input-append">
                                 <input type="text" id="terminal-command">
                                 <button class="btn" type="button" id="terminal-send">Send</button>