diff --git a/addons/web/static/tests/legacy/helpers/test_utils_dom.js b/addons/web/static/tests/legacy/helpers/test_utils_dom.js
index bb56a21e549..7c24798f7d9 100644
--- a/addons/web/static/tests/legacy/helpers/test_utils_dom.js
+++ b/addons/web/static/tests/legacy/helpers/test_utils_dom.js
@@ -134,6 +134,9 @@ import { delay } from "@web/core/utils/concurrency";
         if (typeof el === 'string') {
             el = $(el);
         }
+        if (el.disabled || (el instanceof jQuery && el.get(0).disabled)) {
+            throw new Error("Can't click on a disabled button");
+        }
         if (_isEventTarget(el)) {
             // EventTarget
             matches = [el];
diff --git a/addons/web/static/tests/views/form/form_view_tests.js b/addons/web/static/tests/views/form/form_view_tests.js
index fe1d3df7d67..d5bc27839d9 100644
--- a/addons/web/static/tests/views/form/form_view_tests.js
+++ b/addons/web/static/tests/views/form/form_view_tests.js
@@ -9964,7 +9964,7 @@ QUnit.module("Views", (hooks) => {
 
         await editInput(target, '.o_field_widget[name="foo"] input', "test");
         await clickSave(target);
-        await clickSave(target);
+        assert.ok(target.querySelector(".o_form_button_save").disabled); // Save button is disabled, it can't be clicked
 
         def.resolve();
         await nextTick();