diff --git a/module/task/js/create.js b/module/task/js/create.js
index bb488c49d9..d39bdacca8 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -209,9 +209,6 @@ $(document).ready(function()
 
     var adjustButtons = function()
     {
-        $taskTeamEditor.find('.btn-move-up.disabled,.btn-move-down.disabled,.btn-delete.disabled').removeClass('disabled').attr('disabled', null);
-        $taskTeamEditor.find('.btn-move-up:first').addClass('disabled').attr('disabled', 'disabled');
-        $taskTeamEditor.find('.btn-move-down:last').addClass('disabled').attr('disabled', 'disabled');
         var $deleteBtn = $taskTeamEditor.find('.btn-delete');
         if ($deleteBtn.length == 1) $deleteBtn.addClass('disabled').attr('disabled', 'disabled');
     };
@@ -233,19 +230,7 @@ $(document).ready(function()
             $row.remove();
             adjustButtons();
         });
-    }).on('click', '.btn-move-up, .btn-move-down', function()
-    {
-        var $this = $(this);
-        if($this.hasClass('btn-move-up'))
-        {
-            $(this).parents('tr').prev().before($(this).parents('tr'));
-        }
-        else
-        {
-            $this.parents('tr').next().after($(this).parents('tr'));
-        }
-        adjustButtons();
-    });;
+    });
 
     adjustButtons();
 });
diff --git a/module/task/js/edit.js b/module/task/js/edit.js
index da8f2f3044..b457c91982 100644
--- a/module/task/js/edit.js
+++ b/module/task/js/edit.js
@@ -93,7 +93,7 @@ $(document).ready(function()
     var $taskTeamEditor = $('#taskTeamEditor').batchActionForm(
     {
         idStart: 0,
-        idEnd: 5,
+        idEnd: newRowCount - 1,
         chosen: true,
         datetimepicker: false,
         colorPicker: false,
@@ -102,9 +102,6 @@ $(document).ready(function()
 
     var adjustButtons = function()
     {
-        $taskTeamEditor.find('.btn-move-up.disabled,.btn-move-down.disabled,.btn-delete.disabled').removeClass('disabled').attr('disabled', null);
-        $taskTeamEditor.find('.btn-move-up:first').addClass('disabled').attr('disabled', 'disabled');
-        $taskTeamEditor.find('.btn-move-down:last').addClass('disabled').attr('disabled', 'disabled');
         var $deleteBtn = $taskTeamEditor.find('.btn-delete');
         if ($deleteBtn.length == 1) $deleteBtn.addClass('disabled').attr('disabled', 'disabled');
     };
@@ -126,19 +123,7 @@ $(document).ready(function()
             $row.remove();
             adjustButtons();
         });
-    }).on('click', '.btn-move-up, .btn-move-down', function()
-    {
-        var $this = $(this);
-        if($this.hasClass('btn-move-up'))
-        {
-            $(this).parents('tr').prev().before($(this).parents('tr'));
-        }
-        else
-        {
-            $this.parents('tr').next().after($(this).parents('tr'));
-        }
-        adjustButtons();
-    });;
+    });
 
     adjustButtons();
 });
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 46ef80ec95..4c173158f2 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<?php include '../../common/view/sortable.html.php';?>
 <?php js::set('toTaskList', $config->global->flow == 'onlyTask' || !empty($task->id));?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
@@ -181,7 +182,7 @@
           </div>
           <div class='modal-content with-padding'>
             <table class="table table-form" id='taskTeamEditor'>
-              <tbody>
+              <tbody class='sortable'>
                 <tr class='template'>
                   <td><?php echo html::select("team[]", $members, '', "class='form-control chosen'");?></td>
                   <td>
@@ -190,11 +191,10 @@
                       <span class='input-group-addon'><?php echo $lang->task->hour;?></span>
                     </div>
                   </td>
-                  <td class='w-130px'>
-                  <button type='button' class='btn btn-link btn-sm btn-icon btn-move-up'><i class='icon-arrow-up'></i></button>
-                  <button type='button' class='btn btn-link btn-sm btn-icon btn-move-down'><i class='icon-arrow-down'></i></button>
-                  <button type="button" class="btn btn-link btn-sm btn-icon btn-add"><i class="icon icon-plus"></i></button>
-                  <button type="button" class="btn btn-link btn-sm btn-icon btn-delete"><i class="icon icon-trash"></i></button>
+                  <td class='w-130px sort-handler'>
+                    <button type="button" class="btn btn-link btn-sm btn-icon btn-add"><i class="icon icon-plus"></i></button>
+                    <button type='button' class='btn btn-link btn-sm btn-icon btn-move'><i class='icon-move'></i></button>
+                    <button type="button" class="btn btn-link btn-sm btn-icon btn-delete"><i class="icon icon-trash"></i></button>
                   </td>
                 </tr>
               </tbody>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index add4bc011a..8ea3be1348 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -13,11 +13,13 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<?php js::set('oldStoryID', $task->story); ?>
-<?php js::set('oldAssignedTo', $task->assignedTo); ?>
-<?php js::set('oldProjectID', $task->project); ?>
-<?php js::set('confirmChangeProject', $lang->task->confirmChangeProject); ?>
-<?php js::set('changeProjectConfirmed', false); ?>
+<?php include '../../common/view/sortable.html.php';?>
+<?php js::set('oldStoryID', $task->story);?>
+<?php js::set('oldAssignedTo', $task->assignedTo);?>
+<?php js::set('oldProjectID', $task->project);?>
+<?php js::set('confirmChangeProject', $lang->task->confirmChangeProject);?>
+<?php js::set('changeProjectConfirmed', false);?>
+<?php js::set('newRowCount', count($task->team) < 6 ? 6 - count($task->team) : 1);?>
 <div class='main-content' id='mainContent'>
   <form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
     <div class='main-header'>
@@ -219,7 +221,7 @@
         </div>
         <div class="modal-content with-padding" id='taskTeamEditor'>
           <table class='table table-form'>
-            <tbody>
+            <tbody class="sortable">
               <?php foreach($task->team as $member):?>
               <tr>
                 <td class='w-250px'><?php echo html::select("team[]", $members, $member->account, "class='form-control chosen'")?></td>
@@ -233,10 +235,10 @@
                     <?php echo html::input("teamLeft[]", $member->left, "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
                   </div>
                 </td>
-                <td class='w-130px'>
-                  <button type='button' class='btn btn-link btn-sm btn-icon btn-move-up'><i class='icon-arrow-up'></i></button>
-                  <button type='button' class='btn btn-link btn-sm btn-icon btn-move-down'><i class='icon-arrow-down'></i></button>
+                <td class='w-130px sort-handler'>
                   <button type="button" class="btn btn-link btn-sm btn-icon btn-add"><i class="icon icon-plus"></i></button>
+                  <button type='button' class='btn btn-link btn-sm btn-icon btn-move'><i class='icon-move'></i></button>
+                  <button type="button" class="btn btn-link btn-sm btn-icon btn-delete"><i class="icon icon-trash"></i></button>
                 </td>
               </tr>
               <?php endforeach;?>
@@ -252,10 +254,9 @@
                     <?php echo html::input("teamLeft[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
                   </div>
                 </td>
-                <td class='w-130px'>
-                  <button type='button' class='btn btn-link btn-sm btn-icon btn-move-up'><i class='icon-arrow-up'></i></button>
-                  <button type='button' class='btn btn-link btn-sm btn-icon btn-move-down'><i class='icon-arrow-down'></i></button>
+                <td class='w-130px sort-handler'>
                   <button type="button" class="btn btn-link btn-sm btn-icon btn-add"><i class="icon icon-plus"></i></button>
+                  <button type='button' class='btn btn-link btn-sm btn-icon btn-move'><i class='icon-move'></i></button>
                   <button type="button" class="btn btn-link btn-sm btn-icon btn-delete"><i class="icon icon-trash"></i></button>
                 </td>
               </tr>