diff --git a/module/bug/model.php b/module/bug/model.php
index 535e2f5955..489aa0f94f 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -698,7 +698,8 @@ class bugModel extends model
             ->add('id', $bugID)
             ->cleanInt('product,module,severity,project,execution,story,task,branch')
             ->stripTags($this->config->bug->editor->edit['id'], $this->config->allowedTags)
-            ->setDefault('product,module,execution,story,task,duplicateBug,branch', 0)
+            ->setDefault('module,execution,story,task,duplicateBug,branch', 0)
+            ->setDefault('product', $oldBug->product)
             ->setDefault('openedBuild', '')
             ->setDefault('os', '')
             ->setDefault('browser', '')
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 48cd5fea48..8cd8029940 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -96,6 +96,7 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
             <div class='detail-title'><?php echo $lang->story->legendBasicInfo;?></div>
             <table class='table table-form'>
               <tbody>
+                <?php if(empty($product->shadow)):?>
                 <tr>
                   <th class='w-80px'><?php echo $lang->bug->product;?></th>
                   <td>
@@ -105,6 +106,7 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                     </div>
                   </td>
                 </tr>
+                <?php endif;?>
                 <tr>
                   <th><?php echo $lang->bug->module;?></th>
                   <td>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index d0a7ad32fd..f95faeab8d 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -112,10 +112,12 @@
           <div class='tab-pane active' id='legendBasicInfo'>
             <table class="table table-data">
               <tbody>
+                <?php if(empty($product->shadow)):?>
                 <tr valign='middle'>
                   <th class='thWidth'><?php echo $lang->bug->product;?></th>
                   <td><?php if(!common::printLink('product', 'view', "productID=$bug->product", $product->name, '', "data-app='product'")) echo $product->name;?></td>
                 </tr>
+                <?php endif;?>
                 <?php if($product->type != 'normal'):?>
                 <tr>
                   <th><?php echo sprintf($lang->product->branch, $lang->product->branchName[$product->type]);?></th>
@@ -123,7 +125,7 @@
                 </tr>
                 <?php endif;?>
                 <tr>
-                  <th><?php echo $lang->bug->module;?></th>
+                  <th class='thWidth'><?php echo $lang->bug->module;?></th>
                   <?php
                   $moduleTitle = '';
                   ob_start();