diff --git a/src/css/tabs/cli.css b/src/css/tabs/cli.css
index dad298ae..04ded8ee 100644
--- a/src/css/tabs/cli.css
+++ b/src/css/tabs/cli.css
@@ -3,7 +3,10 @@
 }
 
 .tab-cli .content_wrapper {
-    height: calc(100% - 92px);
+    flex-direction: column;
+    display: flex;
+    overflow-x: hidden;
+    overflow-y: hidden;
 }
 
 .tab-cli p {
@@ -15,7 +18,7 @@
     border: 1px solid var(--subtleAccent);
     background-color: rgba(0, 0, 0, 0.75);
     margin-top: 0;
-    height: calc(100% - 90px); /* - (p, textarea) */
+    flex-grow: 1;
     background-image: url("../../images/light-wide-1.svg");
     background-repeat: no-repeat;
     background-position: 50% 80%;
@@ -71,6 +74,7 @@
 
 .tab-cli .window .wrapper {
     white-space: pre-wrap;
+    height: 0px;
 }
 
 .tab-cli .window .error_message {
diff --git a/src/js/tabs/cli.js b/src/js/tabs/cli.js
index 150a949d..2bd5d4f5 100644
--- a/src/js/tabs/cli.js
+++ b/src/js/tabs/cli.js
@@ -363,9 +363,9 @@ const lineFeedCode = 10;
 const carriageReturnCode = 13;
 
 function writeToOutput(text) {
-    const windowWrapper = TABS.cli.GUI.windowWrapper;
-    windowWrapper.append(text);
-    $('.tab-cli .window').scrollTop(windowWrapper.height());
+    TABS.cli.GUI.windowWrapper.append(text);
+    const cliWindow = $('.tab-cli .window');
+    cliWindow.scrollTop(cliWindow.prop("scrollHeight"));
 }
 
 function writeLineToOutput(text) {