diff --git a/module/execution/control.php b/module/execution/control.php
index 6d37712eb2..cb8958f3a0 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2208,7 +2208,7 @@ class execution extends control
         $position[] = html::a($browseExecutionLink, $execution->name);
         $position[] = $this->lang->execution->manageProducts;
 
-        $allProducts     = $this->product->getProductPairsByProject($execution->project);
+        $allProducts     = $this->config->systemMode == 'classic' ? $this->product->getPairs('noclosed') : $this->product->getProductPairsByProject($execution->project);
         $linkedProducts  = $this->execution->getProducts($execution->id);
         $linkedBranches  = array();
 
diff --git a/module/product/model.php b/module/product/model.php
index 3ed37a373c..42fb36592a 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -305,7 +305,7 @@ class productModel extends model
      */
     public function getProductPairsByProject($projectID = 0, $status = 'all')
     {
-        $products = (empty($projectID) or $this->config->systemMode == 'classic') ? $this->getList() : $this->getProducts($projectID, $status);
+        $products = empty($projectID) ? $this->getList() : $this->getProducts($projectID, $status);
         $pairs    = array();
         if(!empty($products))
         {