diff --git a/module/testcase/control.php b/module/testcase/control.php
index f4d7f4dae4..e34a74d96c 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -875,6 +875,18 @@ class testcase extends control
                 }
             }
 
+            if(!isset($moduleOptionMenu[$case->module]))
+            {
+                $caseModule = '/';
+                $modulePath = $this->tree->getParents($case->module);
+                foreach($modulePath as $key => $module)
+                {
+                    $caseModule .= $module->name;
+                    if(isset($modulePath[$key + 1])) $caseModule .= '/';
+                }
+                $moduleOptionMenu[$case->module] = $caseModule;
+            }
+
             /* Get product and branches. */
             $product = $this->product->getById($productID);
             if($this->app->tab == 'execution' or $this->app->tab == 'project')
diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php
index 457ed17dd7..f94d9737ad 100644
--- a/module/testcase/view/batchedit.html.php
+++ b/module/testcase/view/batchedit.html.php
@@ -86,6 +86,19 @@
 
               $modules[$caseProductID][$caseBranch] = $this->tree->getOptionMenu($cases[$caseID]->product, 'case', 0, $caseBranch);
           }
+          $caseProductID = isset($caseProductID) ? $caseProductID : $productID;
+          $moduleList    = $modules[$caseProductID];
+          if(!isset($moduleList[$caseBranch]))
+          {
+              $caseModule = '/';
+              $modulePath = $this->tree->getParents($cases[$caseID]->module);
+              foreach($modulePath as $key => $module)
+              {
+                  $caseModule .= $module->name;
+                  if(isset($modulePath[$key + 1])) $caseModule .= '/';
+              }
+              $moduleList[$caseBranch] = $modules[$caseProductID][0] + array($cases[$caseID]->module => $caseModule);
+          }
           ?>
           <tr class='text-center'>
             <td><?php echo $caseID . html::hidden("caseIDList[$caseID]", $caseID);?></td>
@@ -110,8 +123,7 @@
               <?php echo html::select("branches[$caseID]", $branchTagOption, $product->type == 'normal' ? '' : $cases[$caseID]->branch, "class='form-control chosen' onchange='loadBranches($branchProductID, this.value, $caseID)', $disabled");?>
             </td>
             <?php endif;?>
-            <?php $caseProductID = isset($caseProductID) ? $caseProductID : $productID;?>
-            <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$caseID]",  $modules[$caseProductID][$caseBranch],   $cases[$caseID]->module, "class='form-control chosen' onchange='loadStories($productID, this.value, $caseID)'");?></td>
+            <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$caseID]", $moduleList[$caseBranch], $cases[$caseID]->module, "class='form-control chosen' onchange='loadStories($productID, this.value, $caseID)'");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden')?>' style='overflow:visible'><?php echo html::select("story[$caseID]",  $stories,   $cases[$caseID]->story, "class='form-control chosen'");?></td>
             <td style='overflow:visible' title='<?php echo $cases[$caseID]->title?>'>
               <div class='input-group'>
diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php
index 75335c475a..f0836aa3c3 100644
--- a/module/testtask/view/batchrun.html.php
+++ b/module/testtask/view/batchrun.html.php
@@ -37,7 +37,18 @@
           echo html::hidden("caseIDList[$case->id]", $caseID);
           if(!isset($moduleOptionMenu[$case->module])) $moduleOptionMenu += $this->tree->getOptionMenu($case->product, 'case', 0, $case->branch);
       }
-       ?>
+      if(!isset($moduleOptionMenu[$case->module]))
+      {
+          $caseModule = '/';
+          $modulePath = $this->tree->getParents($cases[$caseID]->module);
+          foreach($modulePath as $key => $module)
+          {
+              $caseModule .= $module->name;
+              if(isset($modulePath[$key + 1])) $caseModule .= '/';
+          }
+          $moduleOptionMenu[$case->module] = $caseModule;
+      }
+      ?>
       <tr class='text-center'>
         <td><?php echo $caseID . html::hidden("version[$caseID]", $case->version)?></td>
         <td class='text-left'><?php echo "<span title='" . $moduleOptionMenu[$case->module] . "'>" . $moduleOptionMenu[$case->module] . "</span>"?></td>