diff --git a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less
index 58bd9d2664..2b6bc1d9df 100644
--- a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less
+++ b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less
@@ -1,7 +1,7 @@
 @import '../../shared/branding/colors.default.less';
 
 .JobResultsStdOut {
-    height: 100%;
+    height: ~"calc(100% - 70px)";
 }
 
 .JobResultsStdOut-toolbar {
@@ -31,6 +31,7 @@
     padding-right: 8px;
     padding-top: 10px;
     border-top-left-radius: 5px;
+    z-index: 1;
 }
 
 .JobResultsStdOut-expandAllButton {
@@ -85,21 +86,20 @@
 }
 
 .JobResultsStdOut-stdoutContainer {
-    height: ~"calc(100% - 108px)";
+    height: ~"calc(100% - 48px)";
     background-color: @default-no-items-bord;
-    border: 1px solid @default-list-header-bg;
-    border-top: 0px;
-    border-radius: 5px;
-    border-top-left-radius: 0px;
-    border-top-right-radius: 0px;
-    margin-bottom: 10px;
-    overflow: scroll;
+    overflow-y: scroll;
+    overflow-x: hidden;
 }
 
 .JobResultsStdOut-numberColumnPreload {
     background-color: #EBEBEB;
     width: 70px;
     position: fixed;
+    top: 148px;
+    bottom: 20px;
+    margin-top: 65px;
+    margin-bottom: 65px;
 }
 
 .JobResultsStdOut-aLineOfStdOut {
@@ -149,3 +149,21 @@
     word-break: break-word;
     width:100%;
 }
+
+.JobResultsStdOut-footer {
+    height: 10px;
+    border-bottom-right-radius: 5px;
+    border-bottom-left-radius: 5px;
+    background-color: @default-no-items-bord;
+    border: 1px solid @default-list-header-bg;
+    border-top: 0px;
+    border-radius: 5px;
+    border-top-left-radius: 0px;
+    border-top-right-radius: 0px;
+}
+
+.JobResultsStdOut-footerNumberColumn {
+    background-color: @default-list-header-bg;
+    width: 70px;
+    height: 100%;
+}
diff --git a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html
index 152429c7d4..c0f13597c4 100644
--- a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html
+++ b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html
@@ -28,4 +28,7 @@
     <div class="JobResultsStdOut-stdoutContainer">
         <div class="JobResultsStdOut-numberColumnPreload"></div>
     </div>
+    <div class="JobResultsStdOut-footer">
+        <div class="JobResultsStdOut-footerNumberColumn"></div>
+    </div>
 </div>
diff --git a/awx/ui/client/src/job-results/job-results.block.less b/awx/ui/client/src/job-results/job-results.block.less
index 137f3b425a..f6ac115a70 100644
--- a/awx/ui/client/src/job-results/job-results.block.less
+++ b/awx/ui/client/src/job-results/job-results.block.less
@@ -17,12 +17,12 @@
 
 .JobResults-leftSide {
     .OnePlusTwo-left--panel(100%, @breakpoint-md);
-    height: 80vh;
+    height: ~"calc(100vh - 177px)";
 }
 
 .JobResults-rightSide {
     .OnePlusTwo-right--panel(100%, @breakpoint-md);
-    height: 80vh;
+    height: ~"calc(100vh - 177px)";
 
     @media (max-width: @breakpoint-md - 1px) {
         padding-right: 15px;