diff --git a/module/execution/ui/story.html.php b/module/execution/ui/story.html.php
index 0c28e7197a..776731b9c9 100644
--- a/module/execution/ui/story.html.php
+++ b/module/execution/ui/story.html.php
@@ -174,7 +174,8 @@ sidebar
         'modules'     => $moduleTree,
         'activeKey'   => $param,
         'settingLink' => !$execution->hasProduct && !$execution->multiple ? createLink('tree', 'browse', "rootID={$product->id}&viewType=story") : null,
-        'closeLink'   => $this->createLink('execution', 'story', "executionID={$execution->id}&storyType={$storyType}&orderBy={$orderBy}&type=byModule&param=0")
+        'closeLink'   => $this->createLink('execution', 'story', "executionID={$execution->id}&storyType={$storyType}&orderBy={$orderBy}&type=byModule&param=0"),
+        'settingApp'  => !$execution->hasProduct && !$execution->multiple ? 'project' : ''
     )))
 );
 
diff --git a/module/execution/ui/task.html.php b/module/execution/ui/task.html.php
index b18e4f3c24..61be794404 100644
--- a/module/execution/ui/task.html.php
+++ b/module/execution/ui/task.html.php
@@ -108,6 +108,7 @@ sidebar
         set::modules($moduleTree),
         set::activeKey($moduleID),
         set::settingLink(createLink('tree', 'browsetask', "rootID=$execution->id&productID=0")),
+        set::settingApp($execution->multiple ? 'execution' : 'project'),
         set::closeLink(createLink('execution', 'task')),
         set::showDisplay($execution->multiple),
         set::app($app->tab)
diff --git a/module/product/ui/browse.html.php b/module/product/ui/browse.html.php
index cd23463b7d..687621bf13 100644
--- a/module/product/ui/browse.html.php
+++ b/module/product/ui/browse.html.php
@@ -46,7 +46,7 @@ $fnGenerateSideBar = function() use ($moduleTree, $moduleID, $productID, $branch
             set::activeKey($isProjectStory && empty($param) && !empty($productID) && count($projectProducts) > 1 ? $productID : $moduleID),
             set::closeLink(helper::createLink($app->rawModule, $app->rawMethod, http_build_query($params))),
             $productID ? set::settingLink(helper::createLink('tree', 'browse', "rootID=$productID&view=story&currentModuleID=0&branch=$branchID")) : null,
-            $projectHasProduct ? set::settingApp('product') : null
+            set::settingApp($projectHasProduct ? 'product' : 'project')
         )
     );
 };