diff --git a/module/block/control.php b/module/block/control.php
index ab14560695..9f3fb7fa3b 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1127,7 +1127,7 @@ class block extends control
     {
         $products  = $this->loadModel('product')->getPairs();
         $productID = isset($this->session->product) ? 0 : $this->session->product;
-        if(!$productID || !array_key_exists($productID, $products)) $productID = array_key_first($products);
+        if(!$productID || !array_key_exists($productID, $products)) $productID = key($products);
 
         $this->view->plans     = $this->loadModel('programplan')->getDataForGantt($this->session->program, $productID, 0, 'task', false);
         $this->view->products  = $products;
diff --git a/module/block/view/scrumproductblock.html.php b/module/block/view/scrumproductblock.html.php
index 0c707ed4d9..850648e266 100644
--- a/module/block/view/scrumproductblock.html.php
+++ b/module/block/view/scrumproductblock.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php if(empty($products)): ?>
-<div class='empty-tip'><?php common::printLink('product', 'create', '', "<i class='icon-plus'></i> " . $lang->product->create, '', "class='btn btn-primary'")?></div>
+<div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
 <?php else:?>
 <div class="panel-body has-table scrollbar-hover">
   <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-projects tablesorter'>
diff --git a/module/block/view/scrumprojectblock.html.php b/module/block/view/scrumprojectblock.html.php
index f31e1dc657..c352fdc54c 100644
--- a/module/block/view/scrumprojectblock.html.php
+++ b/module/block/view/scrumprojectblock.html.php
@@ -20,7 +20,8 @@
   <div class="col-4 text-middle text-center">
     <div class="tile">
       <div class="tile-title"><?php echo $lang->block->allProject;?></div>
-      <div class="tile-amount"><?php echo $summary->total;?></div>
+      <?php $projectLink = $this->createLink('project', 'index', 'locate=no')?>
+      <div class="tile-amount"><?php echo $summary->total ? html::a($projectLink, $summary->total) : 0;?></div>
     </div>
   </div>
   <div class="col-8 text-middle">