diff --git a/application/controllers/LayoutController.php b/application/controllers/LayoutController.php
index 7d2ea9ae5..614fa02a7 100644
--- a/application/controllers/LayoutController.php
+++ b/application/controllers/LayoutController.php
@@ -21,8 +21,9 @@ class LayoutController extends ActionController
         $this->setAutorefreshInterval(15);
         $this->_helper->layout()->disableLayout();
 
-        $url = Url::fromPath($this->getParam('url'));
-        $this->view->menuRenderer = new MenuRenderer(Menu::load(), $url->getRelativeUrl());
+        $url = Url::fromRequest();
+        $menu = new MenuRenderer(Menu::load(), $url->getRelativeUrl());
+        $this->view->menuRenderer = $menu->useCustomRenderers();
     }
 
     /**
diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
index 5de8f3e40..f940be034 100644
--- a/application/layouts/scripts/parts/navigation.phtml
+++ b/application/layouts/scripts/parts/navigation.phtml
@@ -9,14 +9,11 @@ use Icinga\Web\Widget\SearchDashboard;
 if (! $this->auth()->isAuthenticated()) {
     return;
 }
-$dataIcingaUrl = $this->href(
-    'layout/menu',
-    array('url' => Url::fromRequest()->without('renderLayout')->getAbsoluteUrl())
-);
 
 ?>
 <div
-    id="menu" data-base-target="_main" class="container" data-icinga-url="<?= $dataIcingaUrl?>" data-icinga-refresh="15"
+    id="menu" data-base-target="_main" class="container" data-icinga-url="<?=$this->href('layout/menu');?>"
+    data-icinga-refresh="15"
 >
   <? if (SearchDashboard::search('dummy')->getPane('search')->hasComponents()): ?>
       <form action="<?= $this->href('search') ?>" method="get" role="search">
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index b070acf11..c77860d0a 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -151,8 +151,14 @@
 
             // restore menu state
             if (activeMenuId) {
-                $('#menu .active').removeClass('active');
-                $('#' + activeMenuId).addClass('active');
+                $('li.active', el).removeClass('active');
+
+                var $selectedMenu = $('#' + activeMenuId, el);
+                var $outerMenu = $selectedMenu.parent().closest('li');
+                if ($outerMenu.size()) {
+                    $selectedMenu = $outerMenu;
+                }
+                $selectedMenu.addClass('active');
             }
         },
 
@@ -576,7 +582,6 @@
                     $li.addClass('active');
                     activeMenuId = $($li).attr('id');
                     if ($li.hasClass('hover')) {
-                        $('#menu .active').removeClass('active');
                         $li.removeClass('hover');
                     }
                 }
@@ -601,6 +606,9 @@
                     return false;
                 }
             } else {
+                if (isMenuLink) {
+                    activeMenuId = $(event.target).closest('li').attr('id');
+                }
                 $target = self.getLinkTargetFor($a);
             }