diff --git a/module/todo/js/batchcreate.js b/module/todo/js/batchcreate.js
index 04aef4a837..23326e1719 100644
--- a/module/todo/js/batchcreate.js
+++ b/module/todo/js/batchcreate.js
@@ -26,4 +26,11 @@ $(function()
     });
     $('.main-header #date').change();
     parent.$('#triggerModal .modal-content .modal-header .close').hide();
+    
+    $("#select-all").on('click', function()
+    {
+        var isChecked = $("#select-all").hasClass('checked');
+        $("select[name^=begins]").attr("disabled", isChecked ? false : true).trigger('chosen:updated');
+        $("select[name^=ends]").attr("disabled", isChecked ? false : true).trigger('chosen:updated');
+    });
 });
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index 359b2effc7..876c324fb9 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -41,7 +41,7 @@
   }
   $columns = count($visibleFields) + 2;
   ?>
-  <form id='todoBatchAddForm' method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'batchCreate');?>'>
+  <form id='todoBatchAddForm' method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'batchCreate');?>' data-ride='table'>
     <table class='table table-form table-fixed with-border'>
       <thead>
         <tr>
@@ -51,7 +51,7 @@
           <th class='col-name required'><?php echo $lang->todo->name;?></th>
           <th class='col-desc<?php echo zget($visibleFields, 'desc', ' hidden');?>'><?php echo $lang->todo->desc;?></th>
           <th class='col-date<?php echo zget($visibleFields, 'beginAndEnd', ' hidden')?>'><?php echo $lang->todo->beginAndEnd;?></th>
-          <th class='col-pending'></th>
+          <th><div class="checkbox-primary check-all" id="select-all"><label><?php echo $lang->todo->periods['future']?></label></div></th>
         </tr>
       </thead>
       <tbody>