diff --git a/module/bug/ui/edit.html.php b/module/bug/ui/edit.html.php
index bad7e23112..c5f87d30a1 100644
--- a/module/bug/ui/edit.html.php
+++ b/module/bug/ui/edit.html.php
@@ -520,7 +520,7 @@ detailBody
                 picker
                 (
                     on::click('setDuplicateBug'),
-                    set::items(array()),
+                    set::items($duplicateBugs),
                     set::name('duplicateBug'),
                     set::value($bug->duplicateBug)
                 )
diff --git a/module/bug/zen.php b/module/bug/zen.php
index 43caae6845..344c4ff9ca 100644
--- a/module/bug/zen.php
+++ b/module/bug/zen.php
@@ -1161,8 +1161,12 @@ class bugZen extends bug
 
         $this->assignVarsForEdit($bug, $product);
 
+        $duplicateBugs = $this->bug->getProductBugPairs($bug->product, $bug->branch);
+        unset($duplicateBugs[$bug->id]);
+
         $this->view->title                 = $this->lang->bug->edit . "BUG #$bug->id $bug->title - " . $this->products[$bug->product];
         $this->view->bug                   = $bug;
+        $this->view->duplicateBugs         = $duplicateBugs;
         $this->view->product               = $product;
         $this->view->moduleOptionMenu      = $moduleOptionMenu;
         $this->view->projectID             = $bug->project;