diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js
index ba181712527..13aae8b2d88 100644
--- a/addons/web/static/src/js/views/form_view.js
+++ b/addons/web/static/src/js/views/form_view.js
@@ -740,12 +740,13 @@ var FormView = View.extend(common.FieldManagerMixin, {
             return;
         }
         this.disable_button();
-        return this.save().done(function(result) {
+        return this.save().then(function(result) {
             self.trigger("save", result);
-            self.reload().then(function() {
+            return self.reload().then(function() {
                 self.to_view_mode();
                 core.bus.trigger('do_reload_needaction');
                 core.bus.trigger('form_view_saved', self);
+                self.enable_button();
             });
         }).always(function(){
             self.enable_button();