diff --git a/lib/zin/wg/docmenu/v1.php b/lib/zin/wg/docmenu/v1.php
index 50f0193ce4..7ff3b400e6 100644
--- a/lib/zin/wg/docmenu/v1.php
+++ b/lib/zin/wg/docmenu/v1.php
@@ -65,7 +65,7 @@ class docMenu extends wg
         elseif($item->type == 'annex')
         {
             $methodName = 'showFiles';
-            $linkParams = "type={$objectType}&objectID={$item->objectID}";
+            $linkParams = "type={$item->objectType}&objectID={$item->objectID}";
         }
         elseif(in_array($item->type, array('text', 'word','ppt', 'excel', 'attachment')))
         {
diff --git a/module/doc/ui/lefttree.html.php b/module/doc/ui/lefttree.html.php
index 3cee9c787f..436d267899 100644
--- a/module/doc/ui/lefttree.html.php
+++ b/module/doc/ui/lefttree.html.php
@@ -38,6 +38,7 @@ else
     $settingText = '';
 }
 
+if($app->rawModule == 'doc' && $app->rawMethod == 'view') $objectID = $docID;
 sidebar
 (
     set::width(200),
@@ -51,7 +52,7 @@ sidebar
         set::moduleID((int)$moduleID),
         set::linkParams($linkParams),
         set::spaceType($spaceType),
-        set::objectType(isset($type) ? ($type == 'execution' ? 'project' : $type) : ''),
+        set::objectType(isset($type) ? $type : ''),
         set::objectID(isset($objectID) ? $objectID : 0),
         set::sortable(array('handle' => '.icon-move')),
         set::onSort(jsRaw('window.updateOrder')),
diff --git a/module/doc/zen.php b/module/doc/zen.php
index d395569fe8..c0de746ef6 100644
--- a/module/doc/zen.php
+++ b/module/doc/zen.php
@@ -713,6 +713,11 @@ class docZen extends doc
      */
     protected function assignVarsForView(int $docID, int $version, string $type, int $objectID, int $libID, object $doc, object $object, string $objectType, array $libs, array $objectDropdown): void
     {
+        if($type == 'execution' && $this->app->tab == 'project')
+        {
+            $objectType = 'project';
+            $objectID   = $object->project;
+        }
         $this->view->title          = $this->lang->doc->common . $this->lang->hyphen . $doc->title;
         $this->view->docID          = $docID;
         $this->view->type           = $type;
@@ -727,7 +732,7 @@ class docZen extends doc
         $this->view->canBeChanged   = common::canModify($type, $object); // Determines whether an object is editable.
         $this->view->actions        = $docID ? $this->action->getList('doc', $docID) : array();
         $this->view->users          = $this->loadModel('user')->getPairs('noclosed,noletter');
-        $this->view->libTree        = $this->doc->getLibTree((int)$libID, (array)$libs, $type, (int)$doc->module, (int)$objectID, '', 0, $docID);
+        $this->view->libTree        = $this->doc->getLibTree((int)$libID, (array)$libs, $objectType, (int)$doc->module, (int)$objectID, 'all', 0, $docID);
         $this->view->preAndNext     = $this->loadModel('common')->getPreAndNextObject('doc', $docID);
         $this->view->moduleID       = $doc->module;
         $this->view->objectDropdown = $objectDropdown;