diff --git a/module/execution/ui/story.html.php b/module/execution/ui/story.html.php
index a250065da1..6994371a63 100644
--- a/module/execution/ui/story.html.php
+++ b/module/execution/ui/story.html.php
@@ -178,7 +178,7 @@ sidebar
         '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"),
-        'settingApp'  => !$execution->hasProduct && !$execution->multiple ? 'project' : ''
+        'app'         => !$execution->hasProduct && !$execution->multiple ? 'project' : ''
     )))
 );
 
diff --git a/module/execution/ui/task.html.php b/module/execution/ui/task.html.php
index 2b5cfe1ddc..0d31212483 100644
--- a/module/execution/ui/task.html.php
+++ b/module/execution/ui/task.html.php
@@ -112,7 +112,7 @@ sidebar
         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::closeLink(createLink('execution', 'task', "executionID={$executionID}")),
         set::app($app->tab)
     )
 );