diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 75f67b7adc..1ac48f8c66 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -85,7 +85,7 @@
         common::printIcon('bug', 'close',      $params, $bug, 'button', '', '', 'text-danger iframe showinonlybody', true);
         common::printIcon('bug', 'activate',   $params, $bug, 'button', '', '', 'text-success iframe showinonlybody', true);
 
-        common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id", $bug, 'button', $lang->icons['story'], '', '', '', "data-app='product'", $lang->bug->toStory);
+        common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id", $bug, 'button', $lang->icons['story'], '', '', '', "data-app='" . ($this->app->openApp == 'project' ? 'project' : 'product') . "'", $lang->bug->toStory);
         common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap');
 
         echo $this->buildOperateMenu($bug, 'view');
diff --git a/module/testcase/control.php b/module/testcase/control.php
index f3ff078d2c..3f74721bbb 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -273,6 +273,10 @@ class testcase extends control
         {
             $this->loadModel('execution')->setMenu($this->session->execution);
         }
+        else
+        {
+            $this->qa->setMenu($this->products, $productID, $branch);
+        }
 
         $testcaseID = ($from and strpos('testcase|work|contribute', $from)) ? $param : 0;
         $bugID      = $from == 'bug' ? $param : 0;