diff --git a/module/bug/js/batchcreate.js b/module/bug/js/batchcreate.js
index 3f496d94de..2dda13c742 100644
--- a/module/bug/js/batchcreate.js
+++ b/module/bug/js/batchcreate.js
@@ -7,12 +7,11 @@ $(function()
 
     $('#customField').click(function()
     {
-        disabledRequireFields();
+        hiddenRequireFields();
     });
 
     $('#formSettingForm .btn-primary').click(function()
     {
-        $('#formSettingForm > .checkboxes > .checkbox-primary > input').removeAttr('disabled');
         var fields = '';
         $('#formSettingForm > .checkboxes > .checkbox-primary > input:checked').each(function()
         {
@@ -23,10 +22,23 @@ $(function()
         $.post(link, {'fields' : fields}, function()
         {
             checkedShowFields(fields);
-            disabledRequireFields();
-            var $titleCol = $('#batchCreateForm table thead tr th.c-title');
-            if($titleCol.width() < 150) $titleCol.width(150);
             $('#formSetting').parent().removeClass('open');
+
+            if($('#batchCreateForm table thead tr th.c-title').width() < 150) $titleCol.width(150);
+
+            var fieldCount = $('#batchCreateForm .table thead>tr>th:visible').length;
+            $('.form-actions').attr('colspan', fieldCount);
+
+            if(fieldCount > 10)
+            {
+                $('#batchCreateForm > .table-responsive').removeClass('scroll-none');
+                $('#batchCreateForm > .table-responsive').css('overflow', 'auto');
+            }
+            else
+            {
+                $('#batchCreateForm > .table-responsive').addClass('scroll-none');
+                $('#batchCreateForm > .table-responsive').css('overflow', 'visible');
+            }
         });
 
         return false;
@@ -42,56 +54,40 @@ $(function()
  */
 function checkedShowFields(fields)
 {
-    var fieldList    = ',' + fields + ',';
-    var checkedCount = $('#formSettingForm > .checkboxes > .checkbox-primary > input:checked').length;
-    if(checkedCount > 5)
-    {
-        $('.table-responsive').removeClass('scroll-none');
-        $('.table-responsive').css('overflow', 'auto');
-    }
-    else
-    {
-        $('.table-responsive').addClass('scroll-none');
-        $('.table-responsive').css('overflow', 'visible');
-    }
-
+    var fieldList = ',' + fields + ',';
     $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function()
     {
         var field     = ',' + $(this).val() + ',';
+        var $field    = $('#' + $(this).val());
+        var $field    = $('[name^=' + $(this).val() + ']');
         var required  = ',' + requiredFields + ',';
         var $fieldBox = $('.' + $(this).val() + 'Box' );
         if(fieldList.indexOf(field) >= 0 || required.indexOf(field) >= 0)
         {
-
-            if(fieldList.indexOf(field) >= 0) $(this).attr('checked', true);
             $fieldBox.removeClass('hidden');
+            $field.removeAttr('disabled');
         }
-        else
+        else if(!$fieldBox.hasClass('hidden'))
         {
-            if(!$fieldBox.hasClass('hidden')) $fieldBox.addClass('hidden');
-        }
-
-        var fieldCount = $('#batchCreateForm .table thead>tr>th:visible').length;
-        if(fieldCount < 4)
-        {
-            $('#batchCreateForm table thead tr th.c-title').css('width', 'auto');
+            $fieldBox.addClass('hidden');
+            $field.attr('disabled', true);
         }
     });
 }
 
 /**
- * Disabled require field.
+ * Hidden require field.
  *
  * @access public
  * @return void
  */
-function disabledRequireFields()
+function hiddenRequireFields()
 {
     $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function()
     {
         var field    = ',' + $(this).val() + ',';
         var required = ',' + requiredFields + ',';
-        if(required.indexOf(field) >= 0) $(this).attr('disabled', 'disabled');
+        if(required.indexOf(field) >= 0) $(this).closest('div').addClass('hidden');
     });
 }
 
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index 41770dfd40..2785a6a1b6 100755
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -204,7 +204,7 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field)
         </tbody>
         <tfoot>
           <tr>
-            <td colspan='<?php echo count($visibleFields) + 3?>' class='text-center form-actions'>
+            <td colspan='<?php echo count($visibleFields) + 4?>' class='text-center form-actions'>
               <?php echo html::submitButton();?>
               <?php echo html::backButton();?>
             </td>
@@ -218,12 +218,12 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field)
   <tbody>
     <tr>
       <td>%s</td>
-      <td class='<?php echo zget($visibleFields, $product->type, ' hidden')?>' style='overflow:visible'><?php echo html::select("branches[%s]", $branches, $branch, "class='form-control chosen' onchange='setBranchRelated(this.value, $productID, \"%s\")'");?></td>
+      <td class='<?php echo zget($visibleFields, $product->type, ' hidden')?> productBox' style='overflow:visible'><?php echo html::select("branches[%s]", $branches, $branch, "class='form-control chosen' onchange='setBranchRelated(this.value, $productID, \"%s\")'");?></td>
       <td><?php echo html::select("modules[%s]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
       <?php if($config->systemMode == 'new'):?>
-      <td class='<?php echo zget($visibleFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[%s]", $projects, $projectID, "class='form-control chosen' onchange = 'loadProductExecutionsByProject($productID, this.value, \"%s\")'");?></td>
+      <td class='<?php echo zget($visibleFields, 'project', ' hidden')?> projectBox' style='overflow:visible'><?php echo html::select("projects[%s]", $projects, $projectID, "class='form-control chosen' onchange = 'loadProductExecutionsByProject($productID, this.value, \"%s\")'");?></td>
       <?php endif;?>
-      <td class='<?php echo zget($visibleFields, 'execution', ' hidden')?>' style='overflow:visible'><?php echo html::select("executions[%s]", $executions, $executionID, "class='form-control chosen' onchange='loadExecutionBuilds($productID, this.value, \"%s\")'");?></td>
+      <td class='<?php echo zget($visibleFields, 'execution', ' hidden')?> executionBox' style='overflow:visible'><?php echo html::select("executions[%s]", $executions, $executionID, "class='form-control chosen' onchange='loadExecutionBuilds($productID, this.value, \"%s\")'");?></td>
       <td id='buildBox%s'><?php echo html::select("openedBuilds[%s][]", $builds, '', "class='form-control chosen' multiple");?></td>
       <td>
         <div class='input-group'>
@@ -239,14 +239,14 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field)
           </div>
         </div>
       </td>
-      <td class='<?php echo zget($visibleFields, 'deadline', 'hidden')?>'><?php echo html::input("deadlines[%s]", '', "class='form-control form-date'");?></td>
-      <td class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'><?php echo html::textarea("stepses[%s]", '', "rows='1' class='form-control autosize'");?></td>
-      <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>' style='overflow:visible'>    <?php echo html::select("types[%s]", $lang->bug->typeList, $type, "class='form-control chosen'");?></td>
-      <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>' style='overflow:visible'>     <?php echo html::select("pris[%s]", $lang->bug->priList, '', "class='form-control'");?></td>
-      <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>' style='overflow:visible'><?php echo html::select("severities[%s]", $lang->bug->severityList, '3', "class='form-control'");?></td>
-      <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>' style='overflow:visible'>      <?php echo html::select("oses[%s]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
-      <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>' style='overflow:visible'> <?php echo html::select("browsers[%s]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
-      <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[%s]", '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'deadline', 'hidden')?> deadlineBox'><?php echo html::input("deadlines[%s]", '', "class='form-control form-date'");?></td>
+      <td class='<?php echo zget($visibleFields, 'steps', 'hidden')?> stepsBox'><?php echo html::textarea("stepses[%s]", '', "rows='1' class='form-control autosize'");?></td>
+      <td class='<?php echo zget($visibleFields, 'type', 'hidden')?> typeBox' style='overflow:visible'>    <?php echo html::select("types[%s]", $lang->bug->typeList, $type, "class='form-control chosen'");?></td>
+      <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?> priBox' style='overflow:visible'>     <?php echo html::select("pris[%s]", $lang->bug->priList, '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?> severityBox' style='overflow:visible'><?php echo html::select("severities[%s]", $lang->bug->severityList, '3', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'os', 'hidden')?> osBox' style='overflow:visible'>      <?php echo html::select("oses[%s]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
+      <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?> browserBox' style='overflow:visible'> <?php echo html::select("browsers[%s]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
+      <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?> keywordsBox'><?php echo html::input("keywords[%s]", '', "class='form-control'");?></td>
       <?php
       $this->loadModel('flow');
       foreach($extendFields as $extendField) echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->flow->getFieldControl($extendField, '', $extendField->field . "[%s]") . "</td>";