diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php
index c58037d103..b30d3fbe8e 100644
--- a/module/doc/view/side.html.php
+++ b/module/doc/view/side.html.php
@@ -18,47 +18,52 @@ $projectSubLibs = $this->doc->getSubLibGroups('project', array_keys($projects));
         <?php echo html::a($this->createLink('doc', 'createLib'), "<i class='icon icon-plus'></i>", '', "class='btn btn-secondary btn-icon iframe'");?>
       </div>
     </header>
-    <ul id="docsTree" data-ride="tree" class="tree no-margin">
+    <ul id="docsTree" data-name="docsTree" data-ride="tree" data-initial-state="preserve" class="tree no-margin">
       <li class="open">
         <a class="text-muted tree-toggle"><?php echo $lang->doc->fast;?></a>
         <ul>
           <?php foreach($lang->doc->fastMenuList as $menuType => $menu):?>
-          <li><?php echo html::a($this->createLink('doc', 'browse', "libID=0&browseType={$menuType}"), "<i class='icon {$lang->doc->fastMenuIconList[$menuType]}'></i> {$menu}");?>
+          <li <?php if($this->methodName == 'browse' && $browseType == $menuType) echo "class='active'";?>><?php echo html::a($this->createLink('doc', 'browse', "libID=0&browseType={$menuType}"), "<i class='icon {$lang->doc->fastMenuIconList[$menuType]}'></i> {$menu}");?>
           <?php endforeach;?>
         </ul>
       </li>
       <li class="open">
         <?php echo html::a($this->createLink('doc', 'allLibs', "type=product"), $lang->productCommon, '', "class='text-muted'");?>
         <ul>
-          <?php foreach($products as $product):?>
-          <li>
-            <?php echo html::a($this->createLink('doc', 'objectLibs', "type=product&objectID=$product->id"), "<i class='icon icon-cube'></i> " . $product->name);?>
-            <?php if(isset($productSubLibs[$product->id])):?>
+          <?php foreach($products as $productMenu):?>
+          <li <?php if($this->methodName == 'objectlibs' && $type == 'product' && $object->id == $productMenu->id) echo "class='active'";?>>
+            <?php echo html::a($this->createLink('doc', 'objectLibs', "type=product&objectID=$productMenu->id"), "<i class='icon icon-cube'></i> " . $productMenu->name);?>
+            <?php if(isset($productSubLibs[$productMenu->id])):?>
             <ul>
-              <?php foreach($productSubLibs[$product->id] as $subLibID => $subLibName):?>
+              <?php foreach($productSubLibs[$productMenu->id] as $subLibID => $subLibName):?>
               <?php
               if($subLibID == 'project')
               {
-                  $subLibLink = inlink('allLibs', "type=project&product=$product->id");
-                  $icon    = 'icon-stack';
+                  $subLibLink  = inlink('allLibs', "type=project&product=$productMenu->id");
+                  $activeClass = ($this->methodName == 'alllibs' && $type == 'project' && $product == $productMenu->id) ? "class='active'" : '';
+                  $icon        = 'icon-stack';
               }
               elseif($subLibID == 'files')
               {
-                  $subLibLink = inlink('showFiles', "type=product&objectID=$product->id");
-                  $icon    = 'icon-paper-clip';
+                  $subLibLink  = inlink('showFiles', "type=product&objectID=$productMenu->id");
+                  $activeClass = ($this->methodName == 'showfiles' && $type == 'product' && $object->id == $productMenu->id) ? "class='active'" : '';
+                  $icon        = 'icon-paper-clip';
               }
               else  
               {
-                  $subLibLink = inlink('browse', "libID=$subLibID");
-                  $icon    = 'icon-folder-outline';
+                  $subLibLink  = inlink('browse', "libID=$subLibID");
+                  $activeClass = ($this->methodName == 'browse' && $browseType != 'bymodule' && $subLibID == $libID) ? "class='active'" : '';
+                  $icon        = 'icon-folder-outline';
               }
               ?>
-              <li>
+              <li <?php echo $activeClass;?>>
                 <?php echo html::a($subLibLink, "<i class='icon {$icon}'></i> " . $subLibName);?>
                 <?php if(isset($allModules[$subLibID])):?>
                 <ul>
                   <?php foreach($allModules[$subLibID] as $module):?>
-                  <li><?php echo html::a($this->createLink('doc', 'browse', "libID=$subLibID&browseType=byModule&param={$module->id}"), "<i class='icon icon-folder-outline'></i> " . $module->name);?></li>
+                  <li <?php if($this->methodName == 'browse' && $browseType == 'bymodule' && $moduleID == $module->id) echo "class='active'";?>>
+                    <?php echo html::a($this->createLink('doc', 'browse', "libID=$subLibID&browseType=byModule&param={$module->id}"), "<i class='icon icon-folder-outline'></i> " . $module->name);?>
+                  </li>
                   <?php endforeach;?>
                 </ul>
                 <?php endif;?>
@@ -74,7 +79,7 @@ $projectSubLibs = $this->doc->getSubLibGroups('project', array_keys($projects));
         <?php echo html::a($this->createLink('doc', 'allLibs', "type=project"), $lang->projectCommon, '', "class='text-muted'");?>
         <ul>
           <?php foreach($projects as $project):?>
-          <li>
+          <li <?php if($this->methodName == 'objectlibs' && $type == 'project' && $object->id == $project->id) echo "class='active'";?>>
             <?php echo html::a($this->createLink('doc', 'objectLibs', "type=project&objectID=$project->id"), "<i class='icon icon-stack'></i> " . $project->name);?>
             <?php if(isset($projectSubLibs[$project->id])):?>
             <ul>
@@ -82,21 +87,25 @@ $projectSubLibs = $this->doc->getSubLibGroups('project', array_keys($projects));
               <?php
               if($subLibID == 'files')
               {
-                  $subLibLink = inlink('showFiles', "type=project&objectID=$project->id");
-                  $icon = 'icon-paper-clip';
+                  $subLibLink  = inlink('showFiles', "type=project&objectID=$project->id");
+                  $activeClass = ($this->methodName == 'showfiles' && $type == 'project' && $object->id == $project->id) ? "class='active'" : '';
+                  $icon        = 'icon-paper-clip';
               }
               else 
               {
-                  $subLibLink = inlink('browse', "libID=$subLibID");
-                  $icon = 'icon-folder-o';
+                  $subLibLink  = inlink('browse', "libID=$subLibID");
+                  $activeClass = ($this->methodName == 'browse' && $browseType != 'bymodule' && $subLibID == $libID) ? "class='active'" : '';
+                  $icon        = 'icon-folder-o';
               }
               ?>
-              <li>
+              <li <?php echo $activeClass;?>>
                 <?php echo html::a($subLibLink, "<i class='icon $icon'></i> " . $subLibName);?>
                 <?php if(isset($allModules[$subLibID])):?>
                 <ul>
                   <?php foreach($allModules[$subLibID] as $module):?>
-                  <li><?php echo html::a($this->createLink('doc', 'browse', "libID=$subLibID&browseType=byModule&param={$module->id}"), "<i class='icon icon-folder-outline'></i> " . $module->name);?></li>
+                  <li <?php if($this->methodName == 'browse' && $browseType == 'bymodule' && $moduleID == $module->id) echo "class='active'";?>>
+                    <?php echo html::a($this->createLink('doc', 'browse', "libID=$subLibID&browseType=byModule&param={$module->id}"), "<i class='icon icon-folder-outline'></i> " . $module->name);?>
+                  </li>
                   <?php endforeach;?>
                 </ul>
                 <?php endif;?>
@@ -108,16 +117,18 @@ $projectSubLibs = $this->doc->getSubLibGroups('project', array_keys($projects));
           <?php endforeach;?>
         </ul>
       </li>
-      <li>
+      <li <?php if($this->methodName == 'alllibs' && $type == 'custom') echo "class='active'";?>>
         <?php echo html::a($this->createLink('doc', 'allLibs', "type=custom"), $lang->doc->custom, '', "class='text-muted'");?>
         <ul>
           <?php foreach($customLibs as $subLibID => $subLibName):?>
-          <li>
+          <li <?php if($this->methodName == 'browse' && $browseType != 'bymodule' && $libID == $subLibID) echo "class='active'";?>>
             <?php echo html::a(inlink('browse', "libID=$subLibID"), "<i class='icon icon-folder-outline'></i> " . $subLibName);?>
             <?php if(isset($allModules[$subLibID])):?>
             <ul>
               <?php foreach($allModules[$subLibID] as $module):?>
-              <li><?php echo html::a($this->createLink('doc', 'browse', "libID=$subLibID&browseType=byModule&param={$module->id}"), "<i class='icon icon-folder-outline'></i> " . $module->name);?></li>
+              <li <?php if($this->methodName == 'browse' && $browseType == 'bymodule' && $moduleID == $module->id) echo "class='active'";?>>
+                <?php echo html::a($this->createLink('doc', 'browse', "libID=$subLibID&browseType=byModule&param={$module->id}"), "<i class='icon icon-folder-outline'></i> " . $module->name);?>
+              </li>
               <?php endforeach;?>
             </ul>
             <?php endif;?>