diff --git a/module/index/js/index.js b/module/index/js/index.js
index 4791c833d4..6c78c59702 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -113,9 +113,9 @@
                 var viewType = link.params.viewType || link.params.$2;
                 if(['bug', 'case', 'caselib'].includes(viewType)) return 'project';
 
-                if(viewType === 'doc' && link.params.from === 'product') return 'product';
-                if(viewType === 'doc' && link.params.from === 'project') return 'project';
-                if(viewType === 'doc' && link.params.from === 'doc')     return 'doc';
+                if(viewType === 'doc' && (link.params.from === 'product' || link.params.$5 == 'product')) return 'product';
+                if(viewType === 'doc' && (link.params.from === 'project' || link.params.$5 == 'project')) return 'project';
+                if(viewType === 'doc') return 'doc';
             }
             else if(methodLowerCase === 'browsetask')
             {
diff --git a/module/tree/control.php b/module/tree/control.php
index 9a97937361..90c5d8b6ac 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -160,6 +160,9 @@ class tree extends control
                 $this->lang->navGroup->tree  = 'project';
                 $this->lang->tree->menu      = $this->lang->project->menu;
                 $this->lang->tree->menuOrder = $this->lang->project->menuOrder;
+
+                /* The PRJ parameter needs to be present when the tree module belongs to the project grouping. */
+                if($this->session->docList && $this->session->PRJ && strpos($this->session->docList, 'PRJ') === false) $this->session->set('docList', $this->session->docList . '?PRJ=' . $this->session->PRJ);
             }
 
             if($from == 'doc') $this->lang->navGroup->doc = 'doc';
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index faaa66af59..b0b13ed128 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -10,16 +10,10 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include '../../common/view/header.html.php';?>
 <?php if($lang->navGroup->doc == 'doc'):?>
-<style>
-#subHeader {margin-top: -50px; background-color: rgba(0,0,0,0);}
-#pageActions .btn-link { color: #84a2e2; font-size: 14px; line-height: 18px; border: #84a2e2 1px solid;}
-.header-angle-btn {padding: 0;}
-.header-angle-btn .btn{padding: 6px 12px;}
-.header-angle-btn+.header-angle-btn::after, .header-angle-btn+.header-angle-btn::before {top: -50px;}
-</style>
+<?php $pageCSS .= $this->doc->appendNavCSS();?>
 <?php endif;?>
+<?php include '../../common/view/header.html.php';?>
 
 <?php if($viewType != 'story'):?>
 <style>
@@ -35,9 +29,7 @@ li.tree-item-story > .tree-actions .tree-action[data-type=delete]{display:none;}
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php $backLink = $this->session->{$viewType . 'List'} ? $this->session->{$viewType . 'List'} : 'javascript:history.go(-1)';?>
-    <a href="<?php echo $backLink;?>" class="btn btn-secondary">
-      <i class="icon icon-back icon-sm"></i> <?php echo $lang->goback;?>
-    </a>
+    <?php echo html::a($backLink, '<i class="icon icon-back icon-sm"></i>' . $lang->goback, '', 'class="btn btn-secondary"');?>
     <div class="divider"></div>
     <div class="page-title">
       <?php $rootName = $viewType == 'line' or $viewType == 'trainskill' or $viewType == 'trainpost' ? '' : $root->name;?>