diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index cc77ae25bf..a587f48db2 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -277,9 +277,10 @@ function loadAllProductBuilds(productID, buildBox)
             link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild + '&branch=' + branch + '&index=0&type=all');
             $('#resolvedBuildBox').load(link, function()
             {
-                $(this).find('select').picker({optionRender: markReleasedBuilds, dropWidth: 'auto'})
+                $(this).find('select').picker({optionRender: markReleasedBuilds})
                 var $pkResolvedBuild = $('#pk_resolvedBuild-search');
                 $pkResolvedBuild.closest('.picker').css('width', $pkResolvedBuild.closest('td').width());
+                $('#resolvedBuildBox .input-group-btn').remove();
             });
         }
     }
@@ -515,7 +516,7 @@ function loadExecutionRelated(executionID)
     {
         if(currentProjectID == 0) loadProjectByExecutionID(executionID);
         loadExecutionStories(executionID);
-        loadExecutionBuilds(executionID);
+        if($('#openedBuildBox .input-group-btn').length == 1) loadExecutionBuilds(executionID);
         loadAssignedTo(executionID, $('#assignedTo').val());
         loadTestTasks($('#product').val(), executionID);
     }
diff --git a/module/build/control.php b/module/build/control.php
index 2e8f3df6cf..8487f60e01 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -427,6 +427,8 @@ class build extends control
      */
     public function ajaxGetProductBuilds($productID, $varName, $build = '', $branch = 'all', $index = 0, $type = 'normal', $extra = '')
     {
+        $this->app->loadLang('bug');
+        $loadAllBtn = '<span class="input-group-btn"> <button type="button" class="btn" onclick="loadAllBuilds(this)" style="border-radius: 0px 2px 2px 0px; border-left-color: transparent;">' . $this->lang->bug->allBuilds . '</button></span>';
         $isJsonView = $this->app->getViewType() == 'json';
         if($varName == 'openedBuild' )
         {
@@ -446,7 +448,7 @@ class build extends control
             $params = ($type == 'all') ? 'withbranch,noreleased' : 'noterminate,nodone,withbranch,noreleased';
             $builds = $this->build->getBuildPairs($productID, $branch, $params, 0, 'project', $build);
             if($isJsonView) return print(json_encode($builds));
-            return print(html::select($varName, $builds, $build, "class='form-control'"));
+            return print(html::select($varName, $builds, $build, "class='form-control'") . $loadAllBtn);
         }
 
         $builds = $this->build->getBuildPairs($productID, $branch, $type, 0, 'project', $build, false);
@@ -515,7 +517,9 @@ class build extends control
      */
     public function ajaxGetExecutionBuilds($executionID, $productID, $varName, $build = '', $branch = 'all', $index = 0, $needCreate = false, $type = 'normal', $number = '')
     {
+        $this->app->loadLang('bug');
         $isJsonView = $this->app->getViewType() == 'json';
+        $loadAllBtn = '<span class="input-group-btn"> <button type="button" class="btn" onclick="loadAllBuilds(this)" style="border-radius: 0px 2px 2px 0px; border-left-color: transparent;">' . $this->lang->bug->allBuilds . '</button></span>';
         if($varName == 'openedBuild')
         {
             if(empty($executionID)) return $this->ajaxGetProductBuilds($productID, $varName, $build, $branch, $index, $type);
@@ -525,7 +529,7 @@ class build extends control
             if($isJsonView) return print(json_encode($builds));
 
             $varName = $number === '' ? $varName : $varName . "[$number]";
-            return print(html::select($varName . '[]', $builds , '', 'size=4 class=form-control multiple'));
+            return print(html::select($varName . '[]', $builds , '', 'size=4 class=form-control multiple') . $loadAllBtn);
         }
         if($varName == 'openedBuilds')
         {