diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 1a10276487..620dec5cc9 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -79,7 +79,7 @@
             }
 
             $hidden = empty($buttonLink) ? 'hidden' : '';
-            echo "<div class='btn-group dropdown'>";
+            echo "<div class='btn-group dropdown' title='{$buttonTitle}'>";
             echo html::a($buttonLink, "<i class='icon icon-plus'></i> $buttonTitle", '', "class='btn btn-secondary $hidden' data-app='execution'");
 
             if($common::hasPriv('story', 'create') and common::hasPriv('story', 'batchCreate'))
diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index 25942972aa..8da2e6a399 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -34,30 +34,29 @@ body {margin-bottom: 25px;}
 .btn-group button.dropdown-toggle.btn-primary {padding:6px;}
 </style>
 <div id="mainMenu" class="clearfix">
+  <?php
+  if(!empty($productID))
+  {
+      $product    = $this->product->getById($productID);
+      $removeLink = $browseType == 'byproduct' ? inlink('task', "executionID=$executionID&browseType=$status&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("productBrowseParam")';
+      $moduleName = $product->name;
+      $html       = $moduleName . html::a($removeLink, "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted'");
+  }
+  elseif(!empty($moduleID))
+  {
+      $module     = $this->tree->getById($moduleID);
+      $removeLink = $browseType == 'bymodule' ? inlink('task', "executionID=$executionID&browseType=$status&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("moduleBrowseParam")';
+      $moduleName = $module->name;
+      $html       = $moduleName . html::a($removeLink, "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted'");
+  }
+  else
+  {
+      $this->app->loadLang('tree');
+      $html = $moduleName = $this->lang->tree->all;
+  }
+  ?>
   <div id="sidebarHeader">
-    <div class="title">
-      <?php
-      if(!empty($productID))
-      {
-          $product    = $this->product->getById($productID);
-          $removeLink = $browseType == 'byproduct' ? inlink('task', "executionID=$executionID&browseType=$status&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("productBrowseParam")';
-          echo $product->name;
-          echo html::a($removeLink, "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted'");
-      }
-      elseif(!empty($moduleID))
-      {
-          $module     = $this->tree->getById($moduleID);
-          $removeLink = $browseType == 'bymodule' ? inlink('task', "executionID=$executionID&browseType=$status&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("moduleBrowseParam")';
-          echo $module->name;
-          echo html::a($removeLink, "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted'");
-      }
-      else
-      {
-          $this->app->loadLang('tree');
-          echo $this->lang->tree->all;
-      }
-      ?>
-    </div>
+    <div class="title" title="<?php echo $moduleName?>"><?php echo $html;?></div>
   </div>
   <div class="btn-toolbar pull-left">
     <?php
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 4ac2cb0f3b..6fcd53c302 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -43,7 +43,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
 <div id="mainMenu" class="clearfix">
   <?php if(!$isProjectStory):?>
   <div id="sidebarHeader">
-    <div class="title">
+    <div class="title" title="<?php echo $moduleName;?>">
       <?php
       echo $moduleName;
       if($moduleID)