diff --git a/module/jenkins/control.php b/module/jenkins/control.php
index 3bb59632bb..d6e0a4d275 100644
--- a/module/jenkins/control.php
+++ b/module/jenkins/control.php
@@ -125,9 +125,9 @@ class jenkins extends control
      */
     public function ajaxGetJenkinsTasks($id)
     {
-        if(empty($id)) return print(json_encode(array('' => '')));
+        if(empty($id)) return print('');
 
-        $tasks = $this->jenkins->getTasks($id);
-        echo json_encode($tasks);
+        $this->view->tasks = $this->jenkins->getTasks($id, 3);
+        $this->display();
     }
 }
diff --git a/module/jenkins/view/ajaxgetjenkinstasks.html.php b/module/jenkins/view/ajaxgetjenkinstasks.html.php
index a58535289e..f4c6d73dd6 100644
--- a/module/jenkins/view/ajaxgetjenkinstasks.html.php
+++ b/module/jenkins/view/ajaxgetjenkinstasks.html.php
@@ -83,7 +83,7 @@
         </li>
         <?php else:?>
         <li data-idx='<?php echo $task;?>' data-id='<?php echo $task;?>'>
-          <a href='###' id='<?php echo $task;?>' class='text-ellipsis' onclick='setJenkinsJob("<?php echo $task;?>","<?php echo $groupName;?>")' title='<?php echo $task;?>' data-key='<?php echo $task;?>' ><?php echo $task;?></a>
+          <a href='###' id='<?php echo $groupName;?>' class='text-ellipsis' onclick='setJenkinsJob("<?php echo $task;?>","<?php echo $groupName;?>")' title='<?php echo $task;?>' data-key='<?php echo $task;?>' ><?php echo $task;?></a>
         </li>
         <?php endif;?>
       <?php endforeach;?>
diff --git a/module/job/css/create.css b/module/job/css/create.css
index 5c44ac685f..ab92639f76 100644
--- a/module/job/css/create.css
+++ b/module/job/css/create.css
@@ -2,7 +2,8 @@
 .only-pick-time thead th, .only-pick-time tfoot th {color: transparent !important;}
 .checkbox-primary.checkbox-inline {display: inline-block !important;}
 .checkbox-primary.checkbox-inline label {padding-left: 5px !important;}
-.jktask-label {min-width: 50px; max-width: 300px; border-radius: 0px 4px 4px 0px;}
+.jktask-label {width: 326px; border-radius: 0px 4px 4px 0px;}
+.search-list {max-width: 500px;}
 .input-group-addon {border-radius: 2px 0px 0px 2px !important;}
 button.text-right {min-width: 100px; text-align: right;}
 #server_chosen .chosen-single {border-right: 0px;}
@@ -10,6 +11,12 @@ button.text-right {min-width: 100px; text-align: right;}
 #svnDirBox .input-group {width: unset !important;}
 #jenkinsServerTR .input-group-addon {border-left-width: 0 !important;}
 #jenkinsServerTR .dropdown {position: relative;}
-#jenkinsServerTR .table-col:first-child {width: 375.5px;}
+#jenkinsServerTR .table-col:first-child {width: 375px;}
 
 .chosen-container .chosen-drop{z-index: 1100;} /* from c20b7e7a5 */
+
+#dropMenuTasks>.table-row {width: unset;}
+
+#paramName {width: 324px;}
+#paramValue {width: 181px;}
+#paramDiv .table-row {table-layout: unset;}
diff --git a/module/job/css/edit.css b/module/job/css/edit.css
index 57c8a09567..93aa7f302b 100644
--- a/module/job/css/edit.css
+++ b/module/job/css/edit.css
@@ -6,3 +6,11 @@
 #pipelineBox {width: 385px;}
 #svnDirBox .input-group {width: unset !important;}
 #jenkinsServerTR .input-group-addon {border-left-width: 0 !important;}
+#jenkinsServerTR .dropdown {position: relative;}
+#jenkinsServerTR .table-col:first-child {width: 375px;}
+
+#paramName {width: 324px;}
+#paramValue {width: 181px;}
+#paramDiv .table-row {table-layout: unset;}
+.jktask-label {width: 326px; border-radius: 0px 4px 4px 0px;}
+.search-list {max-width: 500px;}
diff --git a/module/job/js/create.js b/module/job/js/create.js
index cd188907e9..48a4cb6b16 100644
--- a/module/job/js/create.js
+++ b/module/job/js/create.js
@@ -18,7 +18,7 @@ $(document).ready(function()
         $('#frameBox .loading').remove();
         $('#frameBox .input-group').append(html);
         $('#frameBox #frame').chosen();
-        
+
         $('#frame').change();
     }
     getFrameSelect('');
@@ -171,26 +171,20 @@ $(document).ready(function()
     $('#jkServer').change(function()
     {
         var jenkinsID = $(this).val();
-        $('#jenkinsServerTR #jkTask').remove();
-        $('#jenkinsServerTR #jkTask_chosen').remove();
+        $('#jenkinsServerTR .dropdown,#jenkinsServerTR .input-group-addon').hide();
         $('#jenkinsServerTR .input-group').append("<div class='load-indicator loading'></div>");
-        $.getJSON(createLink('jenkins', 'ajaxGetJenkinsTasks', 'jenkinsID=' + jenkinsID), function(tasks)
-        {
-            html = "<select id='jkTask' name='jkTask' class='form-control'>";
-            for(taskKey in tasks)
-            {
-                var task = tasks[taskKey];
-                html += "<option value='" + taskKey + "'>" + task + "</option>";
-            }
-            html += '</select>';
-            $('#jenkinsServerTR .loading').remove();
-            $('#jenkinsServerTR .input-group').append(html);
+        setJenkinsJob('', '');
 
-            $('#jenkinsServerTR #jkTask').chosen({drop_direction: 'auto'});
-        })
+        $.get(createLink('jenkins', 'ajaxGetJenkinsTasks', 'jenkinsID=' + jenkinsID), function(tasks)
+        {
+            $('#jenkinsServerTR .loading').remove();
+            $('#dropMenuTasks').html(tasks);
+            $('#jenkinsServerTR .dropdown,.input-group-addon').show();
+        });
 
         /* There has been a problem with handling the prompt label. */
         $('#jkTaskLabel').remove();
+        $('.jktask-label').addClass('text-right');
     })
 
     $(document).on('change', '#frame', function()
@@ -253,3 +247,18 @@ $(document).ready(function()
     $('#engine').change();
     $('#triggerType').change();
 });
+
+/**
+ * Set jenkins job.
+ *
+ * @param string $name
+ * @param string $task
+ * @access public
+ * @return void
+ */
+function setJenkinsJob(name, task)
+{
+    if(name) $('.jktask-label').removeClass('text-right');
+    $('#jkTask').val(task);
+    $('.jktask-label .text').html(name);
+}
diff --git a/module/job/js/edit.js b/module/job/js/edit.js
index 66066ae271..cf6f3884ce 100644
--- a/module/job/js/edit.js
+++ b/module/job/js/edit.js
@@ -11,7 +11,7 @@ $(document).ready(function()
         var html = "<select id='frame' name='frame' class='form-control chosen'>";
         for(frame in frameList)
         {
-            if(job.engine == 'jenkins' || frame != 'sonarqube') 
+            if(job.engine == 'jenkins' || frame != 'sonarqube')
             {
                 html += "<option value='" + frame + "'";
                 if(frame == job.frame) html += " selected";
@@ -157,26 +157,27 @@ $(document).ready(function()
     $('#jkServer').change(function()
     {
         var jenkinsID = $(this).val();
-        $('#jenkinsServerTR #jkTask').remove();
-        $('#jenkinsServerTR #jkTask_chosen').remove();
+        $('#jenkinsServerTR .dropdown,#jenkinsServerTR .input-group-addon').hide();
         $('#jenkinsServerTR .input-group').append("<div class='load-indicator loading'></div>");
-        $.getJSON(createLink('jenkins', 'ajaxGetJenkinsTasks', 'jenkinsID=' + jenkinsID), function(tasks)
-        {
-            html = "<select id='jkTask' name='jkTask' class='form-control'>";
-            for(taskKey in tasks)
-            {
-                var task = tasks[taskKey];
-                html += "<option value='" + taskKey + "'>" + task + "</option>";
-            }
-            html += '</select>';
-            $('#jenkinsServerTR .loading').remove();
-            $('#jenkinsServerTR .input-group').append(html);
+        setJenkinsJob('', '');
 
-            $('#jenkinsServerTR #jkTask').val(jkTask).chosen();
-        })
+        $.get(createLink('jenkins', 'ajaxGetJenkinsTasks', 'jenkinsID=' + jenkinsID), function(tasks)
+        {
+            $('#jenkinsServerTR .loading').remove();
+            $('#dropMenuTasks').html(tasks);
+            $('#jenkinsServerTR .dropdown,.input-group-addon').show();
+
+            if(jenkinsPipeline)
+            {
+                if(jenkinsPipeline.substr(0, 5) != '/job/') jenkinsPipeline = '/job/' + jenkinsPipeline + '/';
+                document.getElementById(jenkinsPipeline).click();
+                jenkinsPipeline = '';
+            }
+        });
 
         /* There has been a problem with handling the prompt label. */
         $('#jkTaskLabel').remove();
+        $('.jktask-label').addClass('text-right');
     })
 
     $(document).on('change', '#frame', function()
@@ -260,3 +261,18 @@ $(document).ready(function()
     $('#sonarqubeServer').change();
     $('#triggerType').change();
 });
+
+/**
+ * Set jenkins job.
+ *
+ * @param string $name
+ * @param string $task
+ * @access public
+ * @return void
+ */
+function setJenkinsJob(name, task)
+{
+    if(name) $('.jktask-label').removeClass('text-right');
+    $('#jkTask').val(task);
+    $('.jktask-label .text').html(name);
+}
diff --git a/module/job/view/create.html.php b/module/job/view/create.html.php
index 13b7ee4f2b..ccdb62f149 100644
--- a/module/job/view/create.html.php
+++ b/module/job/view/create.html.php
@@ -106,13 +106,17 @@
           </tr>
           <tr id="jenkinsServerTR">
             <th><?php echo $lang->job->jkHost; ?></th>
-            <td colspan='2' class='required'>
+            <td colspan='2'>
               <div class='table-row'>
                 <div class='table-col'><?php echo html::select('jkServer', $jenkinsServerList, '', "class='form-control chosen'"); ?></div>
                 <div class='table-col'>
                   <div class='input-group'>
                     <span class='input-group-addon'><?php echo $lang->job->pipeline;?></span>
-                    <?php echo html::select('jkTask', array('' => ''), '', "class='form-control chosen'"); ?>
+                    <div class='dropdown'>
+                    <?php echo html::hidden('jkTask');?>
+                    <button data-toggle='dropdown' type='button' class='btn jktask-label required text-right'  title=''><span class='text'></span> <span class='caret' style='margin-bottom: -1px'></span></button>
+                    <div id='dropMenuTasks' class='dropdown-menu search-list' data-ride='searchList' data-url=''></div>
+                    </div>
                   </div>
                 </div>
               </div>
diff --git a/module/job/view/edit.html.php b/module/job/view/edit.html.php
index ad741532f6..0424d3bb40 100644
--- a/module/job/view/edit.html.php
+++ b/module/job/view/edit.html.php
@@ -20,6 +20,7 @@
 <?php js::set('jkTask', $job->pipeline);?>
 <?php js::set('job', $job);?>
 <?php js::set('frameList', $lang->job->frameList);?>
+<?php js::set('jenkinsPipeline', $job->engine == 'jenkins' ? $job->pipeline : '');?>
 
 <div id='mainContent' class='main-row'>
   <div class='main-content'>
@@ -128,13 +129,17 @@
           <?php if($job->engine == 'jenkins'):?>
           <tr id="jenkinsServerTR">
             <th><?php echo $lang->job->server;?></th>
-            <td colspan='2' class='required'>
+            <td colspan='2'>
               <div class='table-row'>
-                <div class='table-col'><?php echo html::select('jkServer', $jenkinsServerList, $job->server, "class='form-control chosen'");?></div>
+                <div class='table-col'><?php echo html::select('jkServer', $jenkinsServerList, $job->server, "class='form-control chosen'"); ?></div>
                 <div class='table-col'>
                   <div class='input-group'>
                     <span class='input-group-addon'><?php echo $lang->job->pipeline;?></span>
-                    <?php echo html::select('jkTask', array('' => ''), $job->pipeline, "class='form-control chosen'");?>
+                    <div class='dropdown'>
+                    <?php echo html::hidden('jkTask');?>
+                    <button data-toggle='dropdown' type='button' class='btn jktask-label required text-right'  title=''><span class='text'><?php echo $job->pipeline;?></span> <span class='caret' style='margin-bottom: -1px'></span></button>
+                    <div id='dropMenuTasks' class='dropdown-menu search-list' data-ride='searchList' data-url=''></div>
+                    </div>
                   </div>
                 </div>
               </div>