diff --git a/rundeckapp/web-app/js/executionControl.js b/rundeckapp/grails-app/assets/javascripts/executionControl.js
similarity index 98%
rename from rundeckapp/web-app/js/executionControl.js
rename to rundeckapp/grails-app/assets/javascripts/executionControl.js
index 590dbe18a09..00330d383ed 100644
--- a/rundeckapp/web-app/js/executionControl.js
+++ b/rundeckapp/grails-app/assets/javascripts/executionControl.js
@@ -154,6 +154,12 @@ var FollowControl = Class.create({
                 obj.reload();
             });
         });
+        $(elem).select('.log-wrap-toggle').each(function (e) {
+            Event.observe(e, 'change', function (evt) {
+                Event.stop(evt);
+                obj.setLogWrap(e.down('input').checked ? true : false);
+            });
+        });
         $(elem).select('.opt_append_top_true').each(function(e){
             e.onclick=null;
             Event.observe(e,'click',function(evt){obj.setOutputAppendTop(true);});
@@ -233,6 +239,16 @@ var FollowControl = Class.create({
         this.refresh=this.tailmode;
         this.readyMode();
     },
+    setLogWrap: function (wrapped) {
+        "use strict";
+        if ($(this.cmdoutputtbl)) {
+            if (wrapped) {
+                jQuery($(this.cmdoutputtbl)).removeClass('no-wrap');
+            } else {
+                jQuery($(this.cmdoutputtbl)).addClass('no-wrap');
+            }
+        }
+    },
     readyTail: function(){
         var obj=this;
         $(this.targetElement).select('.opt_mode_tail').each(Element.show);
diff --git a/rundeckapp/grails-app/assets/stylesheets/rundeck.less b/rundeckapp/grails-app/assets/stylesheets/rundeck.less
index 81af9fde720..2efec306a2b 100644
--- a/rundeckapp/grails-app/assets/stylesheets/rundeck.less
+++ b/rundeckapp/grails-app/assets/stylesheets/rundeck.less
@@ -1164,6 +1164,11 @@ section{
       padding: 1px 3px;
       color: black;
     }
+    &.no-wrap {
+      td.data {
+        white-space: pre;
+      }
+    }
     td.time{
       padding: 0 3px;
       background-color: @gray-lighter;
@@ -1222,6 +1227,9 @@ section{
   }
   .log_line{
     white-space: pre-wrap;
+    &.no-wrap {
+      white-space: pre;
+    }
     font-family: "Lucida Console", courier, monospace;
     color: black;
     &.level_verbose, &.level_debug {
diff --git a/rundeckapp/grails-app/views/execution/_showFragment.gsp b/rundeckapp/grails-app/views/execution/_showFragment.gsp
index dfdb4ae0362..d538a94f206 100644
--- a/rundeckapp/grails-app/views/execution/_showFragment.gsp
+++ b/rundeckapp/grails-app/views/execution/_showFragment.gsp
@@ -194,6 +194,10 @@
                     <input type="checkbox" checked/>
                     <g:message code="execution.show.mode.ansicolor.title" default="Ansi Color"/>
                 </label>
+                <label class="log-wrap-toggle">
+                    <input type="checkbox" checked/>
+                    <g:message code="execution.show.mode.wrapmode.title" default="Wrap Long Lines"/>
+                </label>
 
                 </div>
         </div>
diff --git a/rundeckapp/grails-app/views/execution/show.gsp b/rundeckapp/grails-app/views/execution/show.gsp
index 535e9db21d6..40736ab7187 100644
--- a/rundeckapp/grails-app/views/execution/show.gsp
+++ b/rundeckapp/grails-app/views/execution/show.gsp
@@ -44,7 +44,7 @@
       <g:set var="defaultLastLines" value="${grailsApplication.config.rundeck.gui.execution.tail.lines.default}"/>
       <g:set var="maxLastLines" value="${grailsApplication.config.rundeck.gui.execution.tail.lines.max}"/>
       <asset:javascript src="workflow.js"/>
-      <g:javascript src="executionControl.js"/>
+      <asset:javascript src="executionControl.js"/>
       <g:javascript src="executionState.js"/>
       <asset:javascript src="executionState_HistoryKO.js"/>
 
diff --git a/rundeckapp/grails-app/views/framework/adhoc.gsp b/rundeckapp/grails-app/views/framework/adhoc.gsp
index c41bc3c0d0f..e0065b2d2dc 100644
--- a/rundeckapp/grails-app/views/framework/adhoc.gsp
+++ b/rundeckapp/grails-app/views/framework/adhoc.gsp
@@ -22,7 +22,7 @@
     <meta name="layout" content="base"/>
     <meta name="tabpage" content="adhoc"/>
     <title><g:message code="gui.menu.Adhoc"/> - <g:enc>${params.project ?: request.project}</g:enc></title>
-    <g:javascript library="executionControl"/>
+    <asset:javascript src="executionControl.js"/>
     <g:javascript library="yellowfade"/>
     <g:javascript library="pagehistory"/>
     <asset:javascript src="framework/adhoc.js"/>