diff --git a/modoboa/templates/common/generic_modal.html b/modoboa/templates/common/generic_modal.html
index b0a389b0a..047755c51 100644
--- a/modoboa/templates/common/generic_modal.html
+++ b/modoboa/templates/common/generic_modal.html
@@ -10,8 +10,8 @@
       {% block modalbody %}{% endblock %}
     </div>
     <div class="modal-footer">
-      {% if action_label %}<a href="#" class="btn btn-primary {{ action_classes }}">{{ action_label }}</a>{% endif %}
       <a class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</a>
+      {% if action_label %}<a href="#" class="btn btn-primary {{ action_classes }}">{{ action_label }}</a>{% endif %}
     </div>
   </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
diff --git a/modoboa/templates/common/wizard_forms.html b/modoboa/templates/common/wizard_forms.html
index c8bb52850..115209e91 100644
--- a/modoboa/templates/common/wizard_forms.html
+++ b/modoboa/templates/common/wizard_forms.html
@@ -24,6 +24,7 @@
     </div>
     <div class="modal-footer">
       <div class="buttons_list">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</button>
         {% for step in wizard.steps %}
         <div id="step{{ forloop.counter }}_buttons" 
              class="bset{% if forloop.first %} active{% endif %}">
@@ -31,7 +32,6 @@
           {% if step.next %}<a href="#" class="btn btn-primary next">{% trans "Next" %}</a>{% else %}<a href="#" class="btn btn-primary submit">{{ wizard.submit_button_label }}</a>{% endif %}
         </div>
         {% endfor %}
-        <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</button>
       </div>
     </div>
   </div>