diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php
index 25fe06bf3f..b6790f06d7 100644
--- a/module/bug/lang/de.php
+++ b/module/bug/lang/de.php
@@ -131,6 +131,7 @@ $lang->bug->allBugs            = 'Alle';
 $lang->bug->byQuery            = 'Suche';
 $lang->bug->needConfirm        = 'Story geändert';
 $lang->bug->allProduct         = 'Alle' . $lang->productCommon;
+$lang->bug->allProject         = 'Alle' . $lang->projectCommon;
 $lang->bug->my                 = 'Meine';
 $lang->bug->yesterdayResolved  = 'Gestern gelöst ';
 $lang->bug->yesterdayConfirmed = 'Gestern bestätigt ';
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 4090efbee7..405aba1421 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -131,6 +131,7 @@ $lang->bug->allBugs            = 'All Bugs';
 $lang->bug->byQuery            = 'Search';
 $lang->bug->needConfirm        = 'Story Changed';
 $lang->bug->allProduct         = 'All' . $lang->productCommon . 's';
+$lang->bug->allProject         = 'All' . $lang->projectCommon . 's';
 $lang->bug->my                 = 'My';
 $lang->bug->yesterdayResolved  = 'Bug Resolved Yesterday ';
 $lang->bug->yesterdayConfirmed = 'Bug Confirmed Yesterday ';
diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php
index f3b4835de2..14cec035e2 100644
--- a/module/bug/lang/fr.php
+++ b/module/bug/lang/fr.php
@@ -131,6 +131,7 @@ $lang->bug->allBugs            = 'Tous';
 $lang->bug->byQuery            = 'Rechercher';
 $lang->bug->needConfirm        = 'Story Changée';
 $lang->bug->allProduct         = 'Tous les ' . $lang->productCommon . 's';
+$lang->bug->allProject         = 'Tous les ' . $lang->projectCommon . 's';
 $lang->bug->my                 = 'Mes';
 $lang->bug->yesterdayResolved  = 'Bugs Résolus Hier ';
 $lang->bug->yesterdayConfirmed = 'Bugs Confirmés Hier ';
diff --git a/module/bug/lang/vi.php b/module/bug/lang/vi.php
index d13b5f41f4..80a4a08b3b 100644
--- a/module/bug/lang/vi.php
+++ b/module/bug/lang/vi.php
@@ -131,6 +131,7 @@ $lang->bug->allBugs            = 'Tất cả Bugs';
 $lang->bug->byQuery            = 'Tìm kiếm';
 $lang->bug->needConfirm        = 'Câu chuyện đã thay đổi';
 $lang->bug->allProduct         = 'All' . $lang->productCommon;
+$lang->bug->allProject         = 'All' . $lang->projectCommon;
 $lang->bug->my                 = 'Của bạn';
 $lang->bug->yesterdayResolved  = 'Giải quyết hôm qua ';
 $lang->bug->yesterdayConfirmed = 'Xác nhận hôm qua ';
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index a924e0c9a7..63486d6497 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -131,6 +131,7 @@ $lang->bug->allBugs            = '所有';
 $lang->bug->byQuery            = '搜索';
 $lang->bug->needConfirm        = "{$lang->storyCommon}变动";
 $lang->bug->allProduct         = '所有' . $lang->productCommon;
+$lang->bug->allProject         = '所有' . $lang->prodjetCommon;
 $lang->bug->my                 = '我的';
 $lang->bug->yesterdayResolved  = '昨天解决Bug数';
 $lang->bug->yesterdayConfirmed = '昨天确认';
diff --git a/module/bug/model.php b/module/bug/model.php
index b8e875c015..d74c3eef60 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1264,7 +1264,7 @@ class bugModel extends model
         $this->config->bug->search['params']['product']['values']       = array($productID => $products[$productID], 'all' => $this->lang->bug->allProduct);
         $this->config->bug->search['params']['plan']['values']          = $this->loadModel('productplan')->getPairs($productID);
         $this->config->bug->search['params']['module']['values']        = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0);
-        $this->config->bug->search['params']['project']['values']       = $this->product->getProjectPairs($productID);
+        $this->config->bug->search['params']['project']['values']       = $this->product->getProjectPairs($productID) + array('all' => $this->lang->bug->allProject);
         $this->config->bug->search['params']['severity']['values']      = array(0 => '') + $this->lang->bug->severityList; //Fix bug #939.
         $this->config->bug->search['params']['openedBuild']['values']   = $this->loadModel('build')->getProductBuildPairs($productID, 0, $params = '');
         $this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values'];
@@ -2323,6 +2323,16 @@ class bugModel extends model
             $bugQuery = str_replace($allProduct, '1', $bugQuery);
             $bugQuery = $bugQuery . ' AND `product` ' . helper::dbIN($products);
         }
+
+        /* Fix bug #3356. */
+        $allProject = "`project` = 'all'";
+        if(strpos($bugQuery, $allProject) !== false)
+        {
+            $projects = $this->app->user->view->projects;
+            $bugQuery = str_replace($allProject, '1', $bugQuery);
+            $bugQuery = $bugQuery . ' AND `project` ' . helper::dbIN($projects);
+        }
+
         $allBranch = "`branch` = 'all'";
         if($branch and strpos($bugQuery, '`branch` =') === false) $bugQuery .= " AND `branch` in('0','$branch')";
         if(strpos($bugQuery, $allBranch) !== false) $bugQuery = str_replace($allBranch, '1', $bugQuery);