diff --git a/frappe/templates/includes/navbar/navbar_items.html b/frappe/templates/includes/navbar/navbar_items.html
index 99a40a02a0..483e11878c 100644
--- a/frappe/templates/includes/navbar/navbar_items.html
+++ b/frappe/templates/includes/navbar/navbar_items.html
@@ -52,19 +52,10 @@
 {% endif %}
 {% endmacro %}
 
-{% if top_bar_items -%}
-<ul class="mr-auto navbar-nav">
-	{%- for item in top_bar_items -%}
-		{% if not item.parent_label and not item.right -%}
-			{{ render_item(item, parent=True) }}
-		{%- endif -%}
-	{%- endfor %}
-</ul>
-{%- endif %}
-<ul class="ml-auto navbar-nav">
+<ul class="mx-auto navbar-nav">
 	{% include "templates/includes/navbar/navbar_search.html" %}
 	{%- for item in top_bar_items -%}
-		{% if not item.parent_label and item.right -%}
+		{% if not item.parent_label -%}
 			{{ render_item(item, parent=True) }}
 		{%- endif -%}
 	{%- endfor %}
@@ -98,9 +89,12 @@
 		</div>
 	{% endif %}
 
-	{% include "templates/includes/navbar/navbar_login.html" %}
-
 </ul>
+
+<ul class="navbar-nav">
+{% include "templates/includes/navbar/navbar_login.html" %}
+</ul>
+
 {%- if call_to_action -%}
 <a class="btn btn-primary navbar-cta" href="{{ call_to_action_url | abs_url }}">
 	{{ call_to_action }}