diff --git a/module/testcase/control.php b/module/testcase/control.php
index 1ef99605cf..2a3b9d1220 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -926,18 +926,7 @@ class testcase extends control
                 if($product->type != 'normal')
                 {
                     $branches = $this->loadModel('branch')->getPairs($productID);
-                    if($branch === 'all')
-                    {
-                        $modules[0] = $this->tree->getOptionMenu($productID, $viewType = 'case', 0, 0);
-                        foreach($branches as $branchID => $branchName)
-                        {
-                            $modules[$branchID] = $this->tree->getOptionMenu($productID, $viewType = 'case', 0, $branchID);
-                        }
-                    }
-                    else
-                    {
-                        $modules[$branch] = $this->tree->getOptionMenu($productID, $viewType = 'case', 0, $branch);
-                    }
+                    foreach($branches as $branchID => $branchName) $modules[$branchID] = $this->tree->getOptionMenu($productID, $viewType = 'case', 0, $branchID);
                 }
                 else
                 {
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index b840310574..13e6b8a7e9 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -84,7 +84,7 @@
         <div class='table-actions btn-toolbar'>
           <div class='btn-group dropup'>
             <?php
-            $actionLink = $this->createLink('testcase', 'batchEdit', "productID=$productID");
+            $actionLink = $this->createLink('testcase', 'batchEdit', "productID=$productID&branch=$task->branch");
             $misc       = $canBatchEdit ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
             echo html::commonButton($lang->edit, $misc);
             ?>