diff --git a/module/execution/control.php b/module/execution/control.php
index 76c872448f..1f99dec929 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1061,10 +1061,11 @@ class execution extends control
         $this->session->set('caseList', $uri, 'execution');
         $this->session->set('bugList',  $uri, 'execution');
 
-        $products = array('0' => $this->lang->product->all) + $this->product->getProducts($executionID, 'all', '', false);
+        $products = $this->product->getProducts($executionID, 'all', '', false);
+        if(count($products) == 1) $productID = key($products);
 
         $extra = $executionID;
-        $this->lang->modulePageNav = $this->product->select($products, $productID, 'execution', 'testcase', $extra, 0, 0, '', false);
+        $this->lang->modulePageNav = $this->product->select(array('0' => $this->lang->product->all) + $products, $productID, 'execution', 'testcase', $extra, 0, 0, '', false);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
diff --git a/module/execution/css/testcase.css b/module/execution/css/testcase.css
index 0dce57455f..3f05682eb7 100644
--- a/module/execution/css/testcase.css
+++ b/module/execution/css/testcase.css
@@ -1,2 +1,3 @@
 .c-id, .c-pri {width: 50px;}
 .c-result {width: 80px;}
+#pageNav #dropMenu .col-left {padding-bottom: 0px;}
diff --git a/module/execution/view/testcase.html.php b/module/execution/view/testcase.html.php
index dd8d2aca0f..b99f870c88 100644
--- a/module/execution/view/testcase.html.php
+++ b/module/execution/view/testcase.html.php
@@ -27,8 +27,9 @@
       <hr class="space">
       <div class="text-center text-muted"><?php echo $lang->testcase->noModule;?></div>
       <hr class="space">
-      <?php endif;?>
+      <?php else:?>
       <?php echo $moduleTree;?>
+      <?php endif;?>
     </div>
   </div>
   <div class='main-col' data-min-width='400'>
@@ -44,7 +45,7 @@
     <?php else:?>
     <form class='main-table' method='post' id='executionBugForm' data-ride="table">
       <table class='table has-sort-head' id='bugList'>
-      <?php $vars = "executionID=$executionID&type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
+      <?php $vars = "executionID=$executionID&productID=$productID&type=$type&moduleID=$moduleID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
         <thead>
           <tr>
             <th class='w-id'>    <?php common::printOrderLink('id',            $orderBy, $vars, $lang->idAB);?></th>
diff --git a/module/product/model.php b/module/product/model.php
index ecf8a5aafb..ccc9cf3e50 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -93,6 +93,7 @@ class productModel extends model
         }
         $isMobile = $this->app->viewType == 'mhtml';
 
+        $productID = $productID == 'all' ? 0 : $productID;
         setcookie("lastProduct", $productID, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
         if($productID) $currentProduct = $this->getById($productID);