diff --git a/module/execution/control.php b/module/execution/control.php
index 218b446514..bec99166b1 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -803,7 +803,7 @@ class execution extends control
         $this->view->orderBy      = $orderBy;
         $this->view->type         = $this->session->executionStoryBrowseType;
         $this->view->param        = $param;
-        $this->view->moduleTree   = $this->loadModel('tree')->getProjectStoryTreeMenu($executionID, $startModuleID = 0, array('treeModel', 'createExecutionStoryLink'));
+        $this->view->moduleTree   = $this->loadModel('tree')->getExecutionStoryTreeMenu($executionID, $startModuleID = 0, array('treeModel', 'createExecutionStoryLink'));
         $this->view->tabID        = 'story';
         $this->view->storyTasks   = $storyTasks;
         $this->view->storyBugs    = $storyBugs;
diff --git a/module/product/control.php b/module/product/control.php
index ac5957a401..97f1463622 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -132,7 +132,7 @@ class product extends control
         $this->loadModel('execution');
 
         /* Set product, module and query. */
-        $productID = $this->product->saveState($productID, $this->products);
+        $productID = $this->app->rawModule != 'projectstory' ? $this->product->saveState($productID, $this->products) : $productID;
         $branch    = ($branch === '') ? (int)$this->cookie->preBranch : (int)$branch;
         setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
         setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot, '', false, true);
@@ -174,11 +174,25 @@ class product extends control
         {
             setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', false, false);
             $browseType = 'unclosed';
-            $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', $branch, "&param=$param&storyType=$storyType");
+            if($this->app->rawModule == 'projectstory' and empty($productID))
+            {
+                $moduleTree = $this->tree->getExecutionStoryTreeMenu($this->session->PRJ, 0, array('treeModel', 'createProjectStoryLink'));
+            }
+            else
+            {
+                $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', $branch, "&param=$param&storyType=$storyType");
+            }
         }
         else
         {
-            $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', (int)$this->cookie->treeBranch, "&param=$param&storyType=$storyType");
+            if($this->app->rawModule == 'projectstory' and empty($productID))
+            {
+                $moduleTree = $this->tree->getExecutionStoryTreeMenu($this->session->PRJ, 0, array('treeModel', 'createProjectStoryLink'));
+            }
+            else
+            {
+                $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', (int)$this->cookie->treeBranch, "&param=$param&storyType=$storyType");
+            }
         }
 
         if($browseType != 'bymodule' and $browseType != 'bybranch') $this->session->set('storyBrowseType', $browseType);
@@ -201,7 +215,7 @@ class product extends control
         $stories = $this->product->getStories($productID, $branch, $browseType, $queryID, $moduleID, $storyType, $sort, $pager);
         if($this->app->rawModule == 'projectstory')
         {
-            $this->session->set('currentProductType', $product->type);
+            if(!empty($product)) $this->session->set('currentProductType', $product->type);
             $projectProducts = $this->product->getProducts($this->session->PRJ);
             $productPlans    = $this->execution->getPlans($projectProducts);
 
@@ -244,13 +258,15 @@ class product extends control
         $showModule = !empty($this->config->datatable->productBrowse->showModule) ? $this->config->datatable->productBrowse->showModule : '';
         $this->view->modulePairs = $showModule ? $this->tree->getModulePairs($productID, 'story', $showModule) : array();
 
+        $productName = ($this->app->rawModule == 'projectstory' and empty($productID)) ? $this->lang->product->all : $this->products[$productID];
+
         /* Assign. */
-        $this->view->title           = $this->products[$productID]. $this->lang->colon . $this->lang->product->browse;
-        $this->view->position[]      = $this->products[$productID];
+        $this->view->title           = $productName . $this->lang->colon . $this->lang->product->browse;
+        $this->view->position[]      = $productName;
         $this->view->position[]      = $this->lang->product->browse;
         $this->view->productID       = $productID;
         $this->view->product         = $product;
-        $this->view->productName     = $this->products[$productID];
+        $this->view->productName     = $productName;
         $this->view->moduleID        = $moduleID;
         $this->view->stories         = $stories;
         $this->view->plans           = $this->loadModel('productplan')->getPairs($productID, $branch, '', true);
diff --git a/module/product/model.php b/module/product/model.php
index a81c632fcd..90a25c7106 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -823,9 +823,18 @@ class productModel extends model
     {
         $this->config->product->search['actionURL'] = $actionURL;
         $this->config->product->search['queryID']   = $queryID;
-        $this->config->product->search['params']['plan']['values']    = $this->loadModel('productplan')->getPairs($productID);
-        $this->config->product->search['params']['product']['values'] = array($productID => $products[$productID], 'all' => $this->lang->product->allProduct);
-        $this->config->product->search['params']['module']['values']  = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'story', $startModuleID = 0);
+        $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID);
+
+        if($this->app->rawModule == 'projectstory' and empty($productID))
+        {
+            $this->config->product->search['params']['product']['values'] = array('all' => $this->lang->product->allProduct, 'all' => $this->lang->product->allProduct);
+        }
+        else
+        {
+            $this->config->product->search['params']['product']['values'] = array($productID => $products[$productID], 'all' => $this->lang->product->allProduct);
+        }
+
+        $this->config->product->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'story', $startModuleID = 0);
         if($this->session->currentProductType == 'normal')
         {
             unset($this->config->product->search['fields']['branch']);
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 2526773b87..1982955bcc 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -51,6 +51,7 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
       <a href='javascript:;' class='btn btn-link btn-limit text-ellipsis' data-toggle='dropdown' style="max-width: 120px;"><span class='text' title='<?php echo $productName;?>'><?php echo $productName;?></span> <span class='caret'></span></a>
       <ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
         <?php
+        echo "<li>" . html::a($this->createLink('projectstory', 'story', "productID=0"), $lang->product->all)  . "</li>";
         foreach($projectProducts as $product)
         {
             echo "<li>" . html::a($this->createLink('projectstory', 'story', "productID=$product->id&branch=0&browseType=$browseType"), $product->name, '', "title='{$product->name}' class='text-ellipsis'") . "</li>";
diff --git a/module/projectstory/control.php b/module/projectstory/control.php
index ace37abee9..dd9714f268 100644
--- a/module/projectstory/control.php
+++ b/module/projectstory/control.php
@@ -44,8 +44,7 @@ class projectStory extends control
      */
     public function story($productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $this->session->set('storyList',$this->app->getURI(true));
-        if(empty($productID)) $productID = key($this->products);
+        $this->session->set('storyList', $this->app->getURI(true));
 
         $this->lang->menugroup->product       = 'projectstory';
 
diff --git a/module/story/model.php b/module/story/model.php
index c14d43ea30..d9c7db408a 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2313,7 +2313,7 @@ class storyModel extends model
         $type = strtolower($type);
         if($type == 'bysearch')
         {
-            if($this->app->rawModule == 'projectstory') $this->session->PRJStoryQuery = $this->session->storyQuery;
+            if($this->app->rawModule == 'projectstory') $this->session->executionStoryQuery = $this->session->storyQuery;
             $queryID  = (int)$param;
             $products = $this->loadModel('execution')->getProducts($executionID);
 
@@ -2373,8 +2373,8 @@ class storyModel extends model
                 ->andWhere('t2.type')->eq($storyType)
                 ->beginIF($excludeStories)->andWhere('t2.id')->notIN($excludeStories)->fi()
                 ->beginIF($execution->type == 'project')
-                ->andWhere('t1.product')->eq($productID)
-                ->beginIF(!empty($branch))->andWhere('t2.branch')->eq($branch)->fi()
+                ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)
+                ->andWhere('t2.branch')->eq($branch)->fi()
                 ->beginIF(isset($statusFeatureList) and in_array($type, array_keys($statusFeatureList)))->andWhere('t2.status')->eq($type)->fi()
                 ->beginIF(isset($otherFeatureList) and in_array($type, array_keys($otherFeatureList)))->andWhere('t2.' . substr($type, 0, -2))->eq($this->app->user->account)->fi()
                 ->beginIF($type == 'unclosed')->andWhere('t2.status')->in(array_keys($unclosedStatus))->fi()
diff --git a/module/tree/model.php b/module/tree/model.php
index dc77e215a2..2a294a9f47 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -611,7 +611,7 @@ class treeModel extends model
      * @access public
      * @return string
      */
-    public function getProjectStoryTreeMenu($rootID, $startModule = 0, $userFunc)
+    public function getExecutionStoryTreeMenu($rootID, $startModule = 0, $userFunc)
     {
         $extra['executionID'] = $rootID;
         $menu = "<ul id='modules' class='tree' data-ride='tree' data-name='tree-story'>";
@@ -636,7 +636,9 @@ class treeModel extends model
         foreach($products as $id => $product)
         {
             $extra['productID'] = $id;
-            $link  = helper::createLink('execution', 'story', "executionID=$rootID&ordery=&status=byProduct&praram=$id");
+            $projectProductLink   = helper::createLink('projectstory', 'story', "productID=$id");
+            $executionProductLink = helper::createLink('execution', 'story', "executionID=$rootID&ordery=&status=byProduct&praram=$id");
+            $link = $this->app->rawModule == 'projectstory' ? $projectProductLink : $executionProductLink;
             if($productNum > 1) $menu .= "<li>" . html::a($link, $product, '_self', "id='product$id'");
 
             /* tree menu. */
@@ -656,13 +658,15 @@ class treeModel extends model
                 $stmt = $this->dbh->query($query);
                 while($module = $stmt->fetch())
                 {
-                    /* if not manage, ignore unused modules. */
+                    /* If not manage, ignore unused modules. */
                     if(isset($executionModules[$module->id])) $this->buildTree($treeMenu, $module, 'task', $userFunc, $extra);
                 }
                 if((isset($treeMenu[0]) and $branch) or isset($executionBranches[$branch]))
                 {
                     $childMenu = isset($treeMenu[0]) ? "<ul>{$treeMenu[0]}</ul>" : '';
-                    $link      = helper::createLink('execution', 'story', "executionID=$rootID&ordery=&status=byBranch&praram=" . (empty($branch) ? "{$id},0" : $branch));
+                    $projectBranchLink   = helper::createLink('projectstory', 'story', "productID=$id&branch=" . (empty($branch) ? 0 : $branch) . "&browseType=byBranch");
+                    $executionBranchLink = helper::createLink('execution', 'story', "executionID=$rootID&ordery=&status=byBranch&praram=" . (empty($branch) ? "{$id},0" : $branch));
+                    $link = $this->app->rawModule == 'projectstory' ? $projectBranchLink : $executionBranchLink;
                     if($branchName) $treeMenu[0] = "<li>" . html::a($link, $branchName, '_self', "id='branch" . (empty($branch) ? "{$id}_0" : $branch) . "'") . "{$childMenu}</li>";
                 }
                 $tree .= isset($treeMenu[0]) ? $treeMenu[0] : '';
@@ -866,6 +870,21 @@ class treeModel extends model
         return html::a(helper::createLink('execution', 'task', "executionID={$executionID}&type=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
     }
 
+    /**
+     * Create link of project story.
+     *
+     * @param  string $type
+     * @param  object $module
+     * @param  array  $extra
+     * @access public
+     * @return string
+     */
+    public function createProjectStoryLink($type, $module, $extra)
+    {
+        $productID = $extra['productID'];
+        return html::a(helper::createLink('projectstory', 'story', "productID=$productID&branch=&browseType=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
+    }
+
     /**
      * Create link of execution story.
      *