diff --git a/module/bug/js/resolve.ui.js b/module/bug/js/resolve.ui.js
index 875c438bba..9de2248e0d 100644
--- a/module/bug/js/resolve.ui.js
+++ b/module/bug/js/resolve.ui.js
@@ -1,23 +1,3 @@
-function setDuplicate()
-{
-    var resolution = $(event.target).val();
-    if(resolution == 'duplicate')
-    {
-        $.getJSON($.createLink('bug', 'ajaxGetProductBugs', 'projectID=' + productID + '&bugID=' + bugID),function(bugs)
-        {
-            if(!bugs) return;
-
-            $('[name="duplicateBug"]').zui('picker').render({items: bugs});
-        });
-
-        $('#duplicateBugBox').removeClass('hidden');
-    }
-    else
-    {
-        $('#duplicateBugBox').addClass('hidden');
-    }
-}
-
 $(document).off('change', "[name^='resolution']").on('change', "[name^='resolution']", function()
 {
     if(requiredFields.indexOf('resolvedBuild') == -1)
diff --git a/module/bug/ui/resolve.html.php b/module/bug/ui/resolve.html.php
index 4091802c61..4d0a6f266a 100644
--- a/module/bug/ui/resolve.html.php
+++ b/module/bug/ui/resolve.html.php
@@ -47,8 +47,8 @@ formPanel
         (
             set::name('resolution'),
             set::items($lang->bug->resolutionList),
-            on::change('setDuplicate')
-        )
+            on::change()->toggleClass('#duplicateBugBox', 'hidden', 'target.value !== "duplicate"'),
+        ),
     ),
     formRow
     (
@@ -61,9 +61,12 @@ formPanel
             picker
             (
                 set::name('duplicateBug'),
-                set::items(array()),
+                set::items(createLink('bug', 'ajaxGetProductBugs', "projectID=$bug->product&bugID=$bug->id&search={search}")),
                 set::placeholder($lang->bug->placeholder->duplicate),
-                set::value('')
+                set::value(''),
+                set::popWidth('auto'),
+                set::popMaxWidth(600),
+                set::popMinWidth('100%')
             ),
             set::required(true)
         )