diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php
index 8f6c4ed780..4a4a829485 100644
--- a/module/build/view/linkbug.html.php
+++ b/module/build/view/linkbug.html.php
@@ -28,6 +28,7 @@
       <tbody>
       <?php foreach($allBugs as $bug):?>
       <?php if(strpos(",{$build->bugs},", ",$bug->id,") !== false) continue;?>
+      <?php if($build->product != $bug->product) continue; ?>
       <tr>
         <td class='cell-id'>
           <input type='checkbox' name='bugs[<?php echo $bug->id?>]'  value='<?php echo $bug->id;?>' <?php if($bug->status == 'resolved' or $bug->status == 'closed') echo "checked";?> /> 
diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php
index 185c22f385..e1338015f7 100644
--- a/module/build/view/linkstory.html.php
+++ b/module/build/view/linkstory.html.php
@@ -30,6 +30,7 @@
       <tbody>
       <?php foreach($allStories as $story):?>
       <?php if(strpos(",{$build->stories},", ",{$story->id},") !== false) continue; ?>
+      <?php if($build->product != $story->product) continue; ?>
       <tr>
         <td class='cell-id'>
           <input type='checkbox' name='stories[]'  value='<?php echo $story->id;?>' <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?> />