diff --git a/addons/website/static/src/js/tours/tour_utils.js b/addons/website/static/src/js/tours/tour_utils.js
index 0864ba9350a..ee35fdf14ef 100644
--- a/addons/website/static/src/js/tours/tour_utils.js
+++ b/addons/website/static/src/js/tours/tour_utils.js
@@ -184,7 +184,14 @@ function clickOnSnippet(snippet, position = "bottom") {
 function clickOnSave(position = "bottom") {
     return [{
         trigger: "div:not(.o_loading_dummy) > #oe_snippets button[data-action=\"save\"]:not([disabled])",
-        extra_trigger: "body:not(:has(.o_dialog))",
+        // TODO this should not be needed but for now it better simulates what
+        // an human does. By the time this was added, it's technically possible
+        // to drag and drop a snippet then immediately click on save and have
+        // some problem. Worst case probably is a traceback during the redirect
+        // after save though so it's not that big of an issue. The problem will
+        // of course be solved (or at least prevented in stable). More details
+        // in related commit message.
+        extra_trigger: "body:not(:has(.o_dialog)) #oe_snippets:not(:has(.o_we_already_dragging))",
         in_modal: false,
         content: Markup(_t("Good job! It's time to <b>Save</b> your work.")),
         position: position,