diff --git a/awx/ui/client/legacy-styles/stdout.less b/awx/ui/client/legacy-styles/stdout.less
index 822c10e759..68ac91490c 100644
--- a/awx/ui/client/legacy-styles/stdout.less
+++ b/awx/ui/client/legacy-styles/stdout.less
@@ -9,7 +9,7 @@
  @import "./client/src/shared/branding/colors.less";
 
  #jobs-stdout {
-    margin-bottom: 20px;
+    margin-bottom: 0px;
 
     #job-status {
         label {
diff --git a/awx/ui/client/src/shared/layouts/one-plus-one.less b/awx/ui/client/src/shared/layouts/one-plus-one.less
index 10be58981d..4b36d0e34c 100644
--- a/awx/ui/client/src/shared/layouts/one-plus-one.less
+++ b/awx/ui/client/src/shared/layouts/one-plus-one.less
@@ -8,11 +8,12 @@
 
 
 .OnePlusOne-container(@height: 100%; @breakpoint: 900px){
-	height: @height;
+	height: ~"calc(100vh - 150px)";
 	display: flex;
 	flex-direction: row;
 	@media screen and(max-width: @breakpoint){
 		flex-direction: column;
+		height: 100%;
 	}
 }
 
diff --git a/awx/ui/client/src/standard-out/standard-out.block.less b/awx/ui/client/src/standard-out/standard-out.block.less
index 684677dee8..7867e4d94f 100644
--- a/awx/ui/client/src/standard-out/standard-out.block.less
+++ b/awx/ui/client/src/standard-out/standard-out.block.less
@@ -29,9 +29,15 @@ standard-out-log {
 .StandardOut-leftPanel {
     .OnePlusOne-panel--left(100%, @breakpoint-md);
     max-width: 600px;
+    display: flex;
     @media (max-width: @breakpoint-md - 1px) {
         max-width: 100%;
     }
+
+    .Panel {
+         height: ~"calc(100% - 20px)";
+         overflow-y: scroll;
+    }
 }
 
 .StandardOut-rightPanel {
@@ -44,10 +50,7 @@ standard-out-log {
     .Panel {
         display: flex;
         flex-direction: column;
-    }
-
-    .StandardOut-consoleOutput {
-        height: 493px;
+        height: ~"calc(100% - 20px)";
     }
 }
 
@@ -57,17 +60,9 @@ standard-out-log {
 
 .StandardOut-consoleOutput {
     margin-top: 25px;
-    background-color: @default-secondary-bg;
     border-radius: 5px;
-    min-height: 300px;
-    max-height: 100vh;
-    height: ~"calc(100vh - 245px)";
     width: 100%;
-
     overflow: auto;
-    #pre-container {
-        overflow: visible !important;
-    }
 }
 
 .StandardOut-details {