diff --git a/web/app/ui.js b/web/app/ui.js
index 8de5a53e..6dcb6638 100644
--- a/web/app/ui.js
+++ b/web/app/ui.js
@@ -398,7 +398,7 @@ TCAD.ui.Terminal = function(win, commandProcessor) {
         var result = commandProcessor(command);
         out.append($('<div>', {text: result, class: 'terminal-commandResult'}));
       }
-      out.scrollTop(out.height());
+      out.parent().scrollTop(out.height());
     }
   });
 };
\ No newline at end of file
diff --git a/web/css/app.css b/web/css/app.css
index 47530e1a..5964bab4 100644
--- a/web/css/app.css
+++ b/web/css/app.css
@@ -259,14 +259,22 @@ html, body {
   font-family: Monospace;
 }
 
-.terminal-output {
+.terminal-output-area {
   height: calc(100% - 30px);
-  vertical-align: bottom;
+  display: flex;
+  flex-direction: column;
+}
+
+.terminal-output {
+  flex: 1;
+}
+
+.terminal-pusher {
+  height: 100%;
 }
 
 .terminal-input {
   height: 30px;
-  vertical-align: bottom;
 }
 
 .terminal-input input {
diff --git a/web/sketcher.html b/web/sketcher.html
index c2fa7aa6..7513b698 100644
--- a/web/sketcher.html
+++ b/web/sketcher.html
@@ -123,7 +123,10 @@
   <div id="commands" class="win" style="display: none; height: 200px; width: 700px;">
     <div class="tool-caption" >COMMANDS</div>
     <div class="content panel" style="padding: 0;">
-      <div class='terminal-output scroll'></div>
+      <div class='terminal-output-area scroll'>
+        <div class='terminal-pusher'></div>
+        <div class='terminal-output'></div>
+      </div>
       <div class='terminal-input'>
         <input type="text" placeholder="(type a command)"/>
       </div>