diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0aabfbb5480..8aa5ba7b743 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3488,10 +3488,23 @@ instance.web.form.One2ManyList = instance.web.ListView.List.extend({
             colspan: columns,
             'class': 'oe_form_field_one2many_list_row_add'
         }).text(_t("Add a row"))
+            .mousedown(function () {
+                // FIXME: needs to be an official API somehow
+                if (self.view.editor.is_editing()) {
+                    self.view.__ignore_blur = true;
+                }
+            })
             .click(function (e) {
                 e.preventDefault();
                 e.stopPropagation();
-                self.view.do_add_record();
+                // FIXME: there should also be an API for that one
+                if (self.view.editor.form.__blur_timeout) {
+                    clearTimeout(self.view.editor.form.__blur_timeout);
+                    self.view.editor.form.__blur_timeout = false;
+                }
+                self.view.ensure_saved().then(function () {
+                    self.view.do_add_record();
+                });
             });
         this.$current.append(
             $('<tr>').append($cell))