--- tpl/navigation.html.twig
+++ tpl/navigation.html.twig.mod
@@ -1,7 +1,9 @@
+{% set menuCount = menustructure.count() %}
+{% set menuIndex = 0 %}
 {% set submenuIndex = 0 %}
 {% set mainMenu = "nav-1" %}
-{% set historyMenu = "nav-2" %}
-{% set favoritesMenu = "nav-3" %}
+{% set historyMenu = "nav-" ~ (menuCount + 1) %}
+{% set favoritesMenu = "nav-" ~ (menuCount + 2) %}
 {% set historyMenuHeader = historyMenu ~ "-1" %}
 {% set favoritesMenuHeader = favoritesMenu ~ "-1" %}
 
@@ -37,7 +39,6 @@
             {% block admin_navigation_menustructure %}
                 {% for menuholder in menustructure %}
                     {% if menuholder.nodeType == constant("XML_ELEMENT_NODE") and menuholder.childNodes.length %}
-                        {% set menuIndex = 0 %}
                         <h2>
                             {% if menuholder.getAttribute('url') %}
                             <a href="{{ oViewConf.getSelfLink()|raw }}&cl=navigation&amp;fnc=exturl&amp;url={{ menuholder.getAttribute('url')|escape('url') }}"