diff --git a/module/bug/control.php b/module/bug/control.php
index 1b5787c1a5..885fb495a1 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -207,7 +207,7 @@ class bug extends control
 
         $showModule  = !empty($this->config->datatable->bugBrowse->showModule) ? $this->config->datatable->bugBrowse->showModule : '';
         $productName = ($productID and isset($this->products[$productID])) ? $this->products[$productID] : $this->lang->product->allProduct;
-        
+
         $product = $this->product->getById($productID);
         if($product and $product->type != 'normal')
         {
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 2bbe2f801c..066be43156 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -120,6 +120,7 @@ js::set('moduleID', $moduleID);
             <td>
               <div class='input-group' id='buildBox'>
                 <span class="input-group-addon"><?php echo $lang->bug->openedBuild?></span>
+                <?php a($builds);?>
                 <?php echo html::select('openedBuild[]', $builds, empty($buildID) ? '' : $buildID, "multiple=multiple class='chosen form-control'");?>
                 <span class='input-group-addon fix-border' id='buildBoxActions'></span>
                 <div class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' id='all' data-toggle='tooltip' onclick='loadAllBuilds()'")?></div>
diff --git a/module/build/model.php b/module/build/model.php
index 8a556bf792..fea109c4dd 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -269,6 +269,7 @@ class buildModel extends model
      */
     public function getProductBuildPairs($products, $branch = 0, $params = 'noterminate, nodone', $replace = true)
     {
+        if($branch == 'all') $branch = 0;
         $sysBuilds = array();
         if(strpos($params, 'noempty') === false) $sysBuilds = array('' => '');
         if(strpos($params, 'notrunk') === false) $sysBuilds = $sysBuilds + array('trunk' => $this->lang->trunk);
@@ -278,10 +279,24 @@ class buildModel extends model
             ->leftJoin(TABLE_RELEASE)->alias('t3')->on('t1.id = t3.build')
             ->leftJoin(TABLE_BRANCH)->alias('t4')->on('t1.branch = t4.id')
             ->where('t1.product')->in($products)
-            ->beginIF($branch)->andWhere('t1.branch')->in("0,$branch")->fi()
+            ->beginIF($branch)->andWhere('t1.branch')->in("$branch")->fi()
             ->andWhere('t1.deleted')->eq(0)
             ->orderBy('t1.date desc, t1.id desc')->fetchAll('id');
 
+        $productBuildss = array();
+        if($branch != 0)
+        {
+            $productBuildss = $this->dao->select('t1.id, t1.name, t1.execution, t2.status as executionStatus, t3.id as releaseID, t3.status as releaseStatus, t4.name as branchName')->from(TABLE_BUILD)->alias('t1')
+                ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution = t2.id')
+                ->leftJoin(TABLE_RELEASE)->alias('t3')->on('t1.id = t3.build')
+                ->leftJoin(TABLE_BRANCH)->alias('t4')->on('t1.branch = t4.id')
+                ->where('t1.product')->in($products)
+                ->beginIF($branch)->andWhere('t1.branch')->in("0")->fi()
+                ->andWhere('t1.deleted')->eq(0)
+                ->orderBy('t1.date desc, t1.id desc')->fetchAll('id');
+        }
+
+
         /* Set builds and filter done executions and terminate releases. */
         $builds = array();
         foreach($productBuilds as $key => $build)
@@ -290,6 +305,17 @@ class buildModel extends model
             if((strpos($params, 'noterminate') !== false) and ($build->releaseStatus === 'terminate')) continue;
             $builds[$key] = ((strpos($params, 'withbranch') !== false and $build->branchName) ? $build->branchName . '/' : '') . $build->name;
         }
+        if($branch != 0)
+        {
+            $builds = $builds + $sysBuilds;
+            foreach($productBuildss as $key => $build)
+            {
+                if(empty($build->releaseID) and (strpos($params, 'nodone') !== false) and ($build->executionStatus === 'done')) continue;
+                if((strpos($params, 'noterminate') !== false) and ($build->releaseStatus === 'terminate')) continue;
+                $builds[$key] = ((strpos($params, 'withbranch') !== false and $build->branchName) ? $build->branchName . '/' : '') . $build->name;
+            }
+        }
+
 
         if(!$builds) return $sysBuilds;
 
@@ -305,7 +331,8 @@ class buildModel extends model
             foreach($releases as $buildID => $releaseName) $builds[$buildID] = ((strpos($params, 'withbranch') !== false and $productBuilds[$buildID]->branchName) ? $productBuilds[$buildID]->branchName . '/' : '') . $releaseName;
         }
 
-        return $sysBuilds + $builds;
+        if($branch != 0) return $builds;
+        else return $sysBuilds + $builds;
     }
 
     /**