diff --git a/djangocms_frontend/templates/bootstrap5/base.html b/djangocms_frontend/templates/bootstrap5/base.html
index 5621c9ed..f7e5adf2 100644
--- a/djangocms_frontend/templates/bootstrap5/base.html
+++ b/djangocms_frontend/templates/bootstrap5/base.html
@@ -13,7 +13,7 @@
                 <span class="navbar-toggler-icon"></span>
             </button>
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
-                <ul class="navbar-nav me-auto mb-2 mb-lg-0">{% block menubar %}{% show_menu 0 100 0 100 'bootstrap5/menu.html' %}{% endblock %}</ul>
+                <ul class="navbar-nav me-auto mb-2 mb-lg-0">{% block menubar %}{% show_menu 0 100 100 100 'bootstrap5/menu.html' %}{% endblock %}</ul>
                 {% block searchbar %}{% endblock %}
             </div>
         </div>
diff --git a/djangocms_frontend/templates/bootstrap5/menu.html b/djangocms_frontend/templates/bootstrap5/menu.html
index 403e8e48..5193a5a1 100644
--- a/djangocms_frontend/templates/bootstrap5/menu.html
+++ b/djangocms_frontend/templates/bootstrap5/menu.html
@@ -1,12 +1,12 @@
 {% load i18n menu_tags cache %}{% spaceless %}
     {% for child in children %}
         <li class="nav-item text-center {% if child.ancestor %}ancestor{% endif %}{% if child.children %} dropdown{% endif %}">
-            {% if child.children %}<a class="nav-link dropdown-toggle" role="button" data-bs-toggle="dropdown" href="{{ child.get_absolute_url }}" id="menu-{{ child.id|safe }}">{{ child.get_menu_title }}</a>
+            {% if child.children %}<a class="nav-link dropdown-toggle{% if child.selected %} active{% endif %}" role="button" data-bs-toggle="dropdown" data-request="{{ request.path }}" x href="{{ child.get_absolute_url }}" id="menu-{{ child.id|safe }}">{{ child.get_menu_title }}</a>
                 <div class="dropdown-menu" aria-labelledby="menu-{{ child.ancestor.id|safe }}">
                     {% show_menu from_level to_level extra_inactive extra_active "bootstrap5/dropdown.html" "" "" child %}
                 </div>
             {% else %}
-                <a class="nav-link{% if child.selected %} active{% endif %}" href="{{ child.get_absolute_url }}"><span>{{ child.get_menu_title }}</span></a>
+                <a class="nav-link{% if child.selected %} active{% endif %}" data-request="{{ request.path }}"  href="{{ child.get_absolute_url }}"><span>{{ child.get_menu_title }}</span></a>
             {% endif %}
         </li>
     {% endfor %}