diff --git a/addons/web/static/src/js/views/abstract_controller.js b/addons/web/static/src/js/views/abstract_controller.js
index f4f323b01ba..155b1792dc6 100644
--- a/addons/web/static/src/js/views/abstract_controller.js
+++ b/addons/web/static/src/js/views/abstract_controller.js
@@ -91,7 +91,7 @@ var AbstractController = AbstractAction.extend(ControlPanelMixin, {
             this._super.apply(this, arguments),
             this.renderer.appendTo(this.$el)
         ).then(function () {
-            self._update(self.initialState);
+            return self._update(self.initialState);
         });
     },
     /**
@@ -257,7 +257,7 @@ var AbstractController = AbstractAction.extend(ControlPanelMixin, {
                     return;
                 }
                 self.renderer.setLocalState(localState);
-                self._update(state);
+                return self._update(state);
             });
         });
     },
diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js
index 8ced59a4686..e23483b4276 100644
--- a/addons/web/static/tests/fields/basic_fields_tests.js
+++ b/addons/web/static/tests/fields/basic_fields_tests.js
@@ -3690,6 +3690,9 @@ QUnit.module('basic_fields', {
                     '</sheet>' +
                 '</form>',
             res_id: 1,
+            viewOptions: {
+                disable_autofocus: true,
+            },
         });
 
         assert.strictEqual(form.$('.o_field_widget.o_selection > a span.o_status.o_status_red').length, 1,