diff --git a/modoboa/admin/templates/admin/domains.html b/modoboa/admin/templates/admin/domains.html
index 1e0b5e390..2b14b3472 100644
--- a/modoboa/admin/templates/admin/domains.html
+++ b/modoboa/admin/templates/admin/domains.html
@@ -1,10 +1,11 @@
-{% extends "admin/listing.html" %}{% load i18n admin_tags lib_tags %}
+{% extends "admin/listing.html" %}
+{% load i18n admin_tags lib_tags %}
 
 {% block pagetitle %}{% trans "Domains" %}{% endblock %}
 
 {% block extra_css %}
-{{ block.super }}
-{% extra_static_content "domains" "css" user %}
+  {{ block.super }}
+  {% extra_static_content "domains" "css" user %}
 {% endblock %}
 
 {% block extra_js %}
@@ -19,6 +20,14 @@ $(document).ready(function() {
 {% extra_static_content "domains" "js" user %}
 {% endblock %}
 
+{% block toolbar_right %}
+  {% if perms.admin.add_domain %}
+    <a href="{% url 'admin:domain_add' %}" class="btn btn-primary" data-toggle="ajaxmodal" modalcb="admin.newdomain_cb">
+      <span class="fa fa-plus"></span> {% trans "Add" %}
+    </a>
+  {% endif %}
+{% endblock %}
+
 {% block actions %}{% domains_menu "domains" user %}{% endblock %}
 
 {% block table_header %}
diff --git a/modoboa/admin/templatetags/admin_tags.py b/modoboa/admin/templatetags/admin_tags.py
index be7e380d9..3cab73a96 100644
--- a/modoboa/admin/templatetags/admin_tags.py
+++ b/modoboa/admin/templatetags/admin_tags.py
@@ -47,14 +47,6 @@ def domains_menu(selection, user, ajax_mode=True):
          "url": reverse("admin:domain_statistics")}
     ]
     if user.has_perm("admin.add_domain"):
-        entries += [
-            {"name": "newdomain",
-             "label": _("Add domain"),
-             "img": "fa fa-plus",
-             "modal": True,
-             "modalcb": "admin.newdomain_cb",
-             "url": reverse("admin:domain_add")},
-        ]
         entries += events.raiseQueryEvent("ExtraDomainMenuEntries", user)
         entries += [
             {"name": "import",