diff --git a/core/View.php b/core/View.php
index 5888ecb3bca8c71ab8aef81dd7b77536734f4543..42f28c85b7b3847768d907b6377246c8b37c4c2d 100644
--- a/core/View.php
+++ b/core/View.php
@@ -80,6 +80,7 @@ class Piwik_View implements Piwik_iView
 	{
 		try {
 			$this->currentModule = Piwik::getModule();
+			$this->currentAction = Piwik::getAction();
 			$userLogin = Piwik::getCurrentUserLogin();
 			$this->userLogin = $userLogin;
 			
diff --git a/plugins/CoreHome/templates/top_bar.tpl b/plugins/CoreHome/templates/top_bar.tpl
index b97d0b85a88254e7083f6ea497914e3b2ba1de01..f18c4e7b6475952f6f366c9032fb22e550fc8eb5 100644
--- a/plugins/CoreHome/templates/top_bar.tpl
+++ b/plugins/CoreHome/templates/top_bar.tpl
@@ -5,7 +5,7 @@
     
         {if isset($menu._html)}
             {$menu._html}
-        {elseif $menu._url.module == $currentModule}
+        {elseif $menu._url.module == $currentModule && (empty($menu._url.action) || $menu._url.action == $currentAction)}
             <span class="topBarElem"><b>{$label|translate}</b></span> | 
         {else}
             <span class="topBarElem"><a id="topmenu-{$menu._url.module|strtolower}" href="index.php{$menu._url|@urlRewriteWithParameters}">{$label|translate}</a></span> |