diff --git a/module/bug/control.php b/module/bug/control.php
index d9b2ab1289..7decc3783f 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -742,6 +742,11 @@ class bug extends control
                 $this->repo->setMenu($repos);
                 $this->lang->navGroup->bug = 'devops';
             }
+            if($this->app->openApp == 'product')
+            {
+                $this->loadModel('product')->setMenu($bug->product);
+                $this->lang->product->menu->plan['subModule'] .= ',bug';
+            }
         }
 
         /* Get product info. */
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 2f3277774f..517e5232b8 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -32,7 +32,7 @@
   <div class="btn-toolbar pull-right">
     <?php if(common::canModify('product', $product)):?>
     <?php $openApp = strpos('|execution|project|qa|', $this->app->openApp) !== false ? $this->app->openApp : 'qa';?>
-    <?php common::printLink('bug', 'create', "productID={$bug->product}&branch={$bug->branch}&extra=moduleID={$bug->module},projectID={$bug->project},executionID={$bug->execution}", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-primary' data-app='$openApp'"); ?>
+    <?php if($this->app->openApp != 'product') common::printLink('bug', 'create', "productID={$bug->product}&branch={$bug->branch}&extra=moduleID={$bug->module},projectID={$bug->project},executionID={$bug->execution}", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-primary' data-app='$openApp'"); ?>
     <?php endif;?>
   </div>
   <?php endif;?>
@@ -86,14 +86,20 @@
         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='" . ($this->app->openApp == 'project' ? 'project' : 'product') . "'", $lang->bug->toStory);
-        common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap');
+        if($this->app->openApp != 'product')
+        {
+            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');
 
         echo "<div class='divider'></div>";
         common::printIcon('bug', 'edit', $params, $bug);
-        common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy', '', '', false, "data-app='qa'");
+        if($this->app->openApp != 'product')
+        {
+            common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy', '', '', false, "data-app='qa'");
+        }
         common::printIcon('bug', 'delete', $params, $bug, 'button', 'trash', 'hiddenwin');
         ?>
         <?php endif;?>
diff --git a/module/common/lang/.menu.php.swp b/module/common/lang/.menu.php.swp
new file mode 100644
index 0000000000..840cbd60ae
Binary files /dev/null and b/module/common/lang/.menu.php.swp differ
diff --git a/module/productplan/view/.view.html.php.swp b/module/productplan/view/.view.html.php.swp
new file mode 100644
index 0000000000..e9826fd45c
Binary files /dev/null and b/module/productplan/view/.view.html.php.swp differ
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 6ae0af8f1e..08a0c5cc10 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -392,7 +392,7 @@
                   <?php endif;?>
                 </td>
                 <td><span class='label-pri label-pri-<?php echo $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?></span></td>
-                <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
+                <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '', 'data-app="product"');?></td>
                 <td><?php echo zget($users, $bug->openedBy);?></td>
                 <td><?php echo zget($users, $bug->assignedTo);?></td>
                 <td>