diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index 8e70dd22e9..9bc469e2ad 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -88,7 +88,7 @@
           ?>
           <tr>
             <?php $disableAssignedTo = (isset($teams[$taskID]) and $tasks[$taskID]->assignedTo != $this->app->user->account) ? "disabled='disabled'" : '';?>
-            <?php $disableHour = isset($teams[$taskID]) ? "disabled='disabled'" : '';?>
+            <?php $disableHour = (isset($teams[$taskID]) or $tasks[$taskID]->parent < 0) ? "disabled='disabled'" : '';?>
             <?php
             $taskMembers = array();
             if(isset($teams[$taskID]))
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 1e544639bd..641d4ac71c 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -182,7 +182,7 @@
               <tr>
                 <th><?php echo $lang->task->estimate;?></th>
                 <td>
-                  <?php $disabled = !empty($task->team) ? "disabled='disabled'" : '';?>
+                  <?php $disabled = (!empty($task->team) or $task->parent < 0) ? "disabled='disabled'" : '';?>
                   <?php echo html::input('estimate', $task->estimate, "class='form-control' {$disabled}");?>
                 </td>
               </tr>
@@ -193,7 +193,7 @@
               <tr>
                 <th><?php echo $lang->task->left;?></th>
                 <td>
-                  <?php $disabled = !empty($task->team) ? "disabled='disabled'" : '';?>
+                  <?php $disabled = (!empty($task->team)  or $task->parent < 0) ? "disabled='disabled'" : '';?>
                   <?php echo html::input('left', $task->left, "class='form-control' {$disabled}");?>
                 </td>
               </tr>