diff --git a/module/execution/ui/story.html.php b/module/execution/ui/story.html.php
index eff80fceba..b11b0218bf 100644
--- a/module/execution/ui/story.html.php
+++ b/module/execution/ui/story.html.php
@@ -381,6 +381,7 @@ $options = array('storyTasks' => $storyTasks, 'storyBugs' => $storyBugs, 'storyC
 foreach($stories as $story)
 {
     $story->moduleID = $story->module;
+    $story->from     = 'execution';
     $data[] = $this->story->formatStoryForList($story, $options, $storyType);
     if(!isset($story->children)) continue;
 
diff --git a/module/product/ui/browse.html.php b/module/product/ui/browse.html.php
index 6a1aa51a6d..f486b9cdad 100644
--- a/module/product/ui/browse.html.php
+++ b/module/product/ui/browse.html.php
@@ -190,6 +190,7 @@ $options = array('storyTasks' => $storyTasks, 'storyBugs' => $storyBugs, 'storyC
 foreach($stories as $story)
 {
     $story->rawModule    = $story->module;
+    $story->from         = $app->tab;
     $options['branches'] = zget($branchOptions, $story->product, array());
     $data[] = $this->story->formatStoryForList($story, $options, $storyType);
     if(!isset($story->children)) continue;
diff --git a/module/story/zen.php b/module/story/zen.php
index 65731cd7dc..83baeec83f 100644
--- a/module/story/zen.php
+++ b/module/story/zen.php
@@ -1744,17 +1744,9 @@ class storyZen extends story
 
         if($from != 'execution') return helper::createLink('story', 'view', "storyID={$storyID}&version=0&param=0&storyType={$storyType}");
 
-        $execution = $this->execution->getByID($this->session->execution);
-
-        $module = 'story';
-        $method = 'view';
-        $params = "storyID=$storyID&version=0&param={$this->session->execution}&storyType=$storyType";
-        if($execution->multiple)
-        {
-            $module = 'execution';
-            $method = 'storyView';
-            $params = "storyID=$storyID";
-        }
+        $module = 'execution';
+        $method = 'storyView';
+        $params = "storyID=$storyID";
         return helper::createLink($module, $method, $params);
     }