diff --git a/awx/ui/client/src/helpers/LogViewer.js b/awx/ui/client/src/helpers/LogViewer.js
index e098e782dd..bc2f7e6835 100644
--- a/awx/ui/client/src/helpers/LogViewer.js
+++ b/awx/ui/client/src/helpers/LogViewer.js
@@ -366,8 +366,10 @@ export default
                     html = "";
                 if (params.standardOut) {
                     html += '<a href="' + params.jobUrl + 'stdout?format=txt_download" class="btn btn-primary btn-xs  DownloadStandardOut DownloadStandardOut--onModal" id="download-stdout-button" type="button" aw-tool-tip="Download standard out as a .txt file" data-placement="top" ng-show="status === \'cancelled\' || status === \'failed\' || status === \'error\' || status === \'successful\'"><i class="fa fa-download DownloadStandardOut-icon DownloadStandardOut-icon--withText"></i>Download</a>';
+                    html += "<pre class='DownloadStandardOut-pre' ng-non-bindable>" + val + "</pre>\n";
+                } else {
+                    html += "<pre ng-non-bindable>" + val + "</pre>\n";
                 }
-                html += "<pre ng-non-bindable>" + val + "</pre>\n";
                 $('#' + id).empty().html(html);
             };
         }])
diff --git a/awx/ui/client/src/partials/eventviewer.html b/awx/ui/client/src/partials/eventviewer.html
index 54302fc9d1..941e9d80d6 100644
--- a/awx/ui/client/src/partials/eventviewer.html
+++ b/awx/ui/client/src/partials/eventviewer.html
@@ -1,4 +1,4 @@
-<div id="eventviewer-modal-dialog" title="Log View" style="display: none;">
+<div id="eventviewer-modal-dialog" style="display: none;">
     <ul id="eventview-tabs" class="nav nav-tabs">
         <li class="active"><a href="#status" id="status-link" data-toggle="tab" ng-click="toggleTab($event, 'status-link', 'eventview-tabs')">Event</a></li>
         <li><a href="#results" id="results-link" data-toggle="tab" ng-click="toggleTab($event, 'results-link', 'eventview-tabs')">Results</a></li>
@@ -31,4 +31,4 @@
             <div id="json-form-container"></div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/awx/ui/client/src/partials/logviewer.html b/awx/ui/client/src/partials/logviewer.html
index 2fafebf3f7..ff6288d2db 100644
--- a/awx/ui/client/src/partials/logviewer.html
+++ b/awx/ui/client/src/partials/logviewer.html
@@ -1,5 +1,5 @@
 
-<div id="logviewer-modal-dialog" title="Log View" style="display: none;">
+<div id="logviewer-modal-dialog" style="display: none;">
     <ul id="logview-tabs" class="nav nav-tabs">
         <li class="active"><a href="#status" id="status-link" data-toggle="tab" ng-click="toggleTab($event, 'status-link', 'logview-tabs')">Status</a></li>
         <li><a href="#stdout" id="stdout-link" data-toggle="tab" ng-click="toggleTab($event, 'stdout-link', 'logview-tabs')">Standard Out</a></li>
@@ -28,4 +28,4 @@
             <div id="source-container"></div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/awx/ui/client/src/shared/download-standard-out.block.less b/awx/ui/client/src/shared/download-standard-out.block.less
index 984fe1b2e3..7b8c2e9ec4 100644
--- a/awx/ui/client/src/shared/download-standard-out.block.less
+++ b/awx/ui/client/src/shared/download-standard-out.block.less
@@ -12,6 +12,7 @@
 
 .DownloadStandardOut--onModal {
     margin-bottom: 10px;
+    float: right;
 }
 
 .DownloadStandardOut-icon {
@@ -21,3 +22,7 @@
 .DownloadStandardOut-icon--withText {
     margin-right: 5px;
 }
+
+.DownloadStandardOut-pre {
+    width: 100%;
+}