diff --git a/modoboa/core/templatetags/core_tags.py b/modoboa/core/templatetags/core_tags.py
index 1f508ab7d..9c504d12c 100644
--- a/modoboa/core/templatetags/core_tags.py
+++ b/modoboa/core/templatetags/core_tags.py
@@ -19,15 +19,7 @@ register = template.Library()
 @register.simple_tag
 def core_menu(selection, user):
     """Build the top level menu."""
-    entries = []
-    if user.is_admin:
-        entries += [
-            {"name": "dashboard",
-             "label": "",
-             "img": "fa fa-home fa-lg",
-             "url": reverse("core:dashboard")}
-        ]
-    entries += (
+    entries = (
         events.raiseQueryEvent("AdminMenuDisplay", "top_menu", user))
     if user.is_superuser:
         entries += [
diff --git a/modoboa/templates/nlayout.html b/modoboa/templates/nlayout.html
index b41645622..ddafe0477 100644
--- a/modoboa/templates/nlayout.html
+++ b/modoboa/templates/nlayout.html
@@ -37,6 +37,13 @@
 
         <div id="topmenu" class="collapse navbar-collapse">
           <ul class="nav navbar-nav">
+            {% if user.is_admin %}
+              <li{% if selection == "dashboard" %} class="active"{% endif %}>
+                <a name="dashboard" href="{% url 'core:dashboard' %}">
+                  <span class="fa fa-home fa-lg"></span>
+                </a>
+              </li>
+            {% endif %}
             {% if selection %}
               {% extensions_menu selection user %}{% core_menu selection user %}
             {% else %}