diff --git a/module/bug/js/batchedit.js b/module/bug/js/batchedit.js
index fca4d45aac..007112ffdf 100644
--- a/module/bug/js/batchedit.js
+++ b/module/bug/js/batchedit.js
@@ -78,10 +78,12 @@ $(function()
         hiddenRequireFields();
     });
 
+    var maxAutoDropWidth = document.body.scrollWidth + (document.getElementById('resolutions1').offsetWidth / 2) - document.getElementById('resolutions1').getBoundingClientRect().right;
     $('select[id^="duplicateBugs"]').picker(
     {
         disableEmptySearch : true,
         dropWidth : 'auto',
+        maxAutoDropWidth : maxAutoDropWidth,
         onReady: function(event)
         {
             $(event.picker.$container).addClass('required');
diff --git a/module/bug/js/edit.js b/module/bug/js/edit.js
index f9003597c9..e039379845 100644
--- a/module/bug/js/edit.js
+++ b/module/bug/js/edit.js
@@ -23,7 +23,8 @@ $(function()
     $('#duplicateBug').picker(
     {
         disableEmptySearch : true,
-        dropWidth : 'auto'
+        dropWidth : 'auto',
+        maxAutoDropWidth : document.body.scrollWidth + document.getElementById('resolution').offsetWidth - document.getElementById('resolution').getBoundingClientRect().right
     });
 });
 
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index 12e1e27e31..aea25327aa 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -42,7 +42,7 @@ js::set('productID' , $bug->product);
         </tr>
         <tr>
           <th><?php echo $lang->bug->resolvedBuild;?></th>
-          <td id='newBuildExecutionBox' class='hidden'>
+          <td id='newBuildExecutionBox' class='hidden required'>
             <div class='input-group'>
               <span class='input-group-addon'><?php echo (!empty($execution) and $execution->type == 'kanban') ? $lang->bug->kanban : $lang->build->execution;?></span>
               <?php echo html::select('buildExecution', $executions, $bug->execution, "class='form-control chosen'");?>
@@ -50,7 +50,7 @@ js::set('productID' , $bug->product);
           </td>
           <td>
             <div id='resolvedBuildBox'><?php echo html::select('resolvedBuild', $builds, '', "class='form-control chosen'");?></div>
-            <div id='newBuildBox' class='hidden'><?php echo html::input('buildName', '', "class='form-control' placeholder='{$lang->bug->placeholder->newBuildName}'");?></div>
+            <div id='newBuildBox' class='hidden required'><?php echo html::input('buildName', '', "class='form-control' placeholder='{$lang->bug->placeholder->newBuildName}'");?></div>
           </td>
           <td>
             <?php if(common::hasPriv('build', 'create')):?>
diff --git a/module/story/js/edit.js b/module/story/js/edit.js
index 8f012085db..7e1c65d088 100644
--- a/module/story/js/edit.js
+++ b/module/story/js/edit.js
@@ -83,6 +83,7 @@ $(function()
     $('#duplicateStory').picker(
     {
         disableEmptySearch : true,
-        dropWidth : 'auto'
+        dropWidth : 'auto',
+        maxAutoDropWidth : document.body.scrollWidth + document.getElementById('duplicateStory').offsetWidth - document.getElementById('duplicateStoryBox').getBoundingClientRect().right
     });
 })