1 files changed, 12 insertions, 3 deletions
diff --git a/plugins/CoreHome/javascripts/menu_init.js b/plugins/CoreHome/javascripts/menu_init.js
index 490c859185..88a3fc21ad 100644
--- a/plugins/CoreHome/javascripts/menu_init.js
+++ b/plugins/CoreHome/javascripts/menu_init.js
@@ -1,14 +1,23 @@
 $(function () {
-    var isPageHasMenu = $('.Menu--dashboard').size();
+    var isPageHasMenu = $('#secondNavBar').size();
     var isPageIsAdmin = $('#content.admin').size();
+
     if (isPageHasMenu) {
         piwikMenu = new menu();
         piwikMenu.init();
-        piwikMenu.loadFirstSection();
+        if (isPageIsAdmin) {
+            piwikMenu.activateMenu(broadcast.getValueFromUrl('module'), broadcast.getValueFromUrl('action'), '');
+        } else {
+            piwikMenu.loadFirstSection();
+        }
+    } else if (!isPageIsAdmin) {
+        // eg multisites
+        initTopControls();
     }
 
     if(isPageIsAdmin) {
-        // don't use broadcast in admin pages
+        // don't use broadcast in admin page
+        initTopControls();
         return;
     }
     if(isPageHasMenu) {