diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index f0c1927b20..5f82fb6680 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -204,6 +204,7 @@ function loadProductModules(productID)
     branch = $('#branch').val();
     if(typeof(branch) == 'undefined') branch = 0;
     if(typeof(moduleID) == 'undefined') moduleID = 0;
+    if(config.currentMethod == 'edit') moduleID = $('#module').val();
     link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=bug&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=&needManage=true&extra=&currentModuleID=' + moduleID);
     $('#moduleIdBox').load(link, function()
     {
@@ -626,7 +627,8 @@ function notice()
  */
 function setBranchRelated(branchID, productID, num)
 {
-    moduleLink = createLink('tree', 'ajaxGetModules', 'productID=' + productID + '&viewType=bug&branch=' + branchID + '&num=' + num);
+    var currentModuleID = config.currentMethod == 'batchedit' ? $('#modules' + num).val() : 0;
+    moduleLink = createLink('tree', 'ajaxGetModules', 'productID=' + productID + '&viewType=bug&branch=' + branchID + '&num=' + num + '&currentModuleID=' + currentModuleID);
     $.get(moduleLink, function(modules)
     {
         if(!modules) modules = '<select id="modules' + num + '" name="modules[' + num + ']" class="form-control"></select>';
diff --git a/module/story/js/batchedit.js b/module/story/js/batchedit.js
index fd823b61f7..6847a40766 100644
--- a/module/story/js/batchedit.js
+++ b/module/story/js/batchedit.js
@@ -30,7 +30,8 @@ function loadBranches(product, branch, storyID)
     if(typeof(branch) == 'undefined') branch = 0;
     if(!branch) branch = 0;
 
-    moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + product + '&viewtype=story&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=' + storyID);
+    var currentModuleID = $('#modules' + storyID).val();
+    moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + product + '&viewtype=story&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=' + storyID + '&needManage=false&extra=&currentModuleID=' + currentModuleID);
     $('#modules' + storyID).parent('td').load(moduleLink, function(){$('#modules' + storyID).chosen();});
 
     planID = $('#plans' + storyID).val();
diff --git a/module/story/view/header.html.php b/module/story/view/header.html.php
index ec1e52aed1..585c12bf58 100644
--- a/module/story/view/header.html.php
+++ b/module/story/view/header.html.php
@@ -1,5 +1,6 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<?php js::set('rawMethod', $this->app->rawMethod);?>
 <script>
 /**
  * Load product.
@@ -90,7 +91,14 @@ function loadProductModules(productID, branch)
 {
     if(typeof(branch) == 'undefined') branch = $('#branch').val();
     if(!branch) branch = 0;
-    var moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=story&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=&needManage=true');
+
+    var currentModule = 0;
+    if(rawMethod == 'edit')
+    {
+        currentModule = $('#module').val();
+    }
+
+    var moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=story&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=&needManage=true&extra=&currentModuleID=' + currentModule);
     var $moduleIDBox = $('#moduleIdBox');
     $moduleIDBox.load(moduleLink, function()
     {
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 932dd1fddc..0bba55a0bd 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -96,7 +96,7 @@ class testcase extends control
      * @access public
      * @return void
      */
-    public function browse($productID = 0, $branch = '', $browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1, $projectID = 0)
+    public function browse($productID = 0, $branch = 'all', $browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1, $projectID = 0)
     {
         $this->loadModel('datatable');
 
diff --git a/module/testcase/js/batchedit.js b/module/testcase/js/batchedit.js
index 97889bfd11..14220c9659 100644
--- a/module/testcase/js/batchedit.js
+++ b/module/testcase/js/batchedit.js
@@ -30,7 +30,8 @@ function loadBranches(product, branch, caseID)
     if(typeof(branch) == 'undefined') branch = 0;
     if(!branch) branch = 0;
 
-    moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + product + '&viewtype=case&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=' + caseID);
+    var currentModuleID = $('#modules' + caseID).val();
+    moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + product + '&viewtype=case&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=' + caseID + '&needManage=false&extra=&currentModuleID=' + currentModuleID);
     $('#modules' + caseID).parent('td').load(moduleLink, function()
     {
         $("#modules" + caseID).attr('onchange', "loadStories("+ product + ", this.value, " + caseID + ")").chosen();
diff --git a/module/testcase/js/common.js b/module/testcase/js/common.js
index 9835f94fbd..c827dac166 100644
--- a/module/testcase/js/common.js
+++ b/module/testcase/js/common.js
@@ -84,7 +84,8 @@ function loadProductModules(productID, branch)
 {
     if(typeof(branch) == 'undefined') branch = $('#branch').val();
     if(!branch) branch = 0;
-    link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=case&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=&needManage=true');
+    var currentModuleID = config.currentMethod == 'edit' ? $('#module').val() : 0;
+    link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=case&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=&needManage=true&extra=&currentModuleID=' + currentModuleID);
     $('#moduleIdBox').load(link, function()
     {
         var $inputGroup = $(this);
diff --git a/module/tree/control.php b/module/tree/control.php
index 0fd909702d..217e412a07 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -466,7 +466,11 @@ class tree extends control
             {
                 $changeFunc = '';
                 if($viewType == 'task' or $viewType == 'bug' or $viewType == 'case') $changeFunc = "onchange='loadModuleRelated()'";
-                $field  = $fieldID ? "modules[$fieldID]" : 'module';
+                $field = $fieldID ? "modules[$fieldID]" : 'module';
+
+                $currentModule   = $this->tree->getById($currentModuleID);
+                $currentModuleID = (isset($currentModule->branch) and $currentModule->branch == 0) ? $currentModuleID : 0;
+
                 $output = html::select("$field", $optionMenu, $currentModuleID, "class='form-control' $changeFunc");
                 if(count($optionMenu) == 1 and $needManage)
                 {
@@ -529,16 +533,20 @@ class tree extends control
      * @param  string $viewType
      * @param  int    $branchID
      * @param  int    $number
+     * @param  int    $currentModuleID
      * @access public
      * @return string the html select string.
      */
-    public function ajaxGetModules($productID, $viewType = 'story', $branchID, $number)
+    public function ajaxGetModules($productID, $viewType = 'story', $branchID, $number, $currentModuleID = 0)
     {
+        $currentModule   = $this->tree->getById($currentModuleID);
+        $currentModuleID = (isset($currentModule->branch) and $currentModule->branch == 0) ? $currentModuleID : 0;
+
         $modules = $this->tree->getOptionMenu($productID, $viewType, $startModuleID = 0, $branchID);
 
         $moduleName = $viewType == 'bug' ? "modules[$number]" : "module[$number]";
         $modules    = empty($modules) ? array('' => '') : $modules;
-        die(html::select($moduleName, $modules, '', 'class=form-control'));
+        die(html::select($moduleName, $modules, $currentModuleID, 'class=form-control'));
     }
 
     /**