diff --git a/module/project/control.php b/module/project/control.php
index 7797a999ee..3170432fe1 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -163,7 +163,11 @@ class project extends control
             }
             /* Limit current project when no project. */
             if(strpos($this->session->taskQuery, "`project` =") === false) $this->session->set('taskQuery', $this->session->taskQuery . " AND `project` = $projectID");
-            $taskQuery = str_replace("`project` = 'all'", '1', $this->session->taskQuery); // Search all project.
+
+            $projectIDs   = array_keys($this->project->getPairs());
+            $projectQuery = "`project` in (" . implode($projectIDs, ',') . ")";  
+            $taskQuery    = str_replace("`project` = 'all'", $projectQuery, $this->session->taskQuery); // Search all project.
+
             $this->session->set('taskQueryCondition', $taskQuery);
             $this->session->set('taskOrderBy', $orderBy);
             $tasks = $this->project->getSearchTasks($taskQuery, $pager, $orderBy);