diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 1e0d0930e1..2956cfec1d 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -12,6 +12,7 @@ $(function()
         oldOpenedBuild         = '';
         oldTaskID              = 0;
         setAssignedTo(0,productID);
+        createBuild();
     }
 
     if(page == 'create' || page == 'edit' || page == 'assignedto' || page == 'confirmbug')
@@ -220,12 +221,13 @@ function createBuild()
     {
         if($('#project').val() == '')
         {
-            $('#buildBox').append(createRelease);
+            $('#buildBox').append('<a href="' + createLink('release', 'create','productID=' + $('#product').val()) + '" target="_blank">' + createRelease + '</a>');
+            $('#buildBox').append('<a href="javascript:loadProductBuilds(' + $('#product').val() + ')">' + refresh + '</a>');
         }
         else
         {
-            $('#buildBox').append(createBuild);
+            $('#buildBox').append('<a href="' + createLink('build', 'create','projectID=' + $('#project').val()) + '" target="_blank">' + createBuild + '</a>');
+            $('#buildBox').append('<a href="javascript:loadProjectBuilds(' + $('project').val() + ')">' + refresh + '</a>');
         }
-        $('#buildBox').append(refresh);
     }
 }
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 37b08e6c88..7493f41df2 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -18,9 +18,9 @@ include '../../common/view/alert.html.php';
 include '../../common/view/kindeditor.html.php';
 js::set('holders', $lang->bug->placeholder);
 js::set('page', 'create');
-js::set('createRelease', html::a($this->createLink('release', 'create', "productID=$productID"), $lang->release->create, '_blank'));
-js::set('createBuild', html::a($this->createLink('build', 'create', "projectID=$projectID"), $lang->build->create, '_blank'));
-js::set('refresh', html::a("javascript:loadProjectsBuilds($projectID)", $lang->refresh));
+js::set('createRelease', $lang->release->create);
+js::set('createBuild', $lang->build->create);
+js::set('refresh', $lang->refresh);
 ?>
 
 <form method='post' enctype='multipart/form-data' id='dataform' class='ajaxForm'>
@@ -44,13 +44,13 @@ js::set('refresh', html::a("javascript:loadProjectsBuilds($projectID)", $lang->r
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->bug->project;?></th>
-      <td><span id='projectIdBox'><?php echo html::select('project', $projects, $projectID, 'class=select-3 onchange=loadProjectRelated(this.value)');?></span></td>
+      <td><span id='projectIdBox'><?php echo html::select('project', $projects, $projectID, 'class=select-3 onchange=loadProjectRelated(this.value) autocomplete="off"');?></span></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->bug->openedBuild;?></th>
       <td>
         <span id='buildBox'>
-        <?php echo html::select('openedBuild[]', $builds, $buildID, 'size=3 multiple=multiple class=select-3');?>
+        <?php echo html::select('openedBuild[]', $builds, $buildID, 'size=4 multiple=multiple class=select-3');?>
         </span>
       </td>
     </tr>
diff --git a/module/build/model.php b/module/build/model.php
index 1bf874f7b4..7d9c052707 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -96,20 +96,24 @@ class buildModel extends model
         if(strpos($params, 'noempty') === false) $sysBuilds = array('' => '');
         if(strpos($params, 'notrunk') === false) $sysBuilds = $sysBuilds + array('trunk' => 'Trunk');
 
-        $builds = $this->dao->select('id,name')->from(TABLE_BUILD)
+        $productBuilds = $this->dao->select('id,name,project')->from(TABLE_BUILD)
             ->where('product')->in($products)
             ->andWhere('deleted')->eq(0)
-            ->orderBy('date desc, id desc')->fetchPairs();
+            ->orderBy('date desc, id desc')->fetchAll('id');
+        $releases = $this->dao->select('build,name,deleted')->from(TABLE_RELEASE)
+           ->where('product')->in($products)
+           ->fetchAll('build');
 
-        if(strpos($params, 'release') !== false)
+        $builds = array();
+        foreach($productBuilds as $key => $build)
         {
-            $releases = $this->dao->select('build,name')->from(TABLE_RELEASE)
-               ->where('product')->in($products)
-               ->andWhere('deleted')->eq(0)
-               ->fetchPairs('build');
-            foreach($builds as $key => $build) 
+            if($build->project) 
             {
-                if($key and isset($releases[$key])) $builds[$key] = $releases[$key]; 
+                $builds[$key] = isset($releases[$key]) ? $releases[$key]->name : $build->name;
+            }
+            else if(isset($releases[$key]) and !$releases[$key]->deleted)
+            {
+                $builds[$key] = $releases[$key]->name; 
             }
         }