diff --git a/addons/analytic/static/src/components/analytic_distribution/analytic_distribution.js b/addons/analytic/static/src/components/analytic_distribution/analytic_distribution.js
index 82bf09e8334..8a71d203643 100644
--- a/addons/analytic/static/src/components/analytic_distribution/analytic_distribution.js
+++ b/addons/analytic/static/src/components/analytic_distribution/analytic_distribution.js
@@ -64,10 +64,14 @@ export class AnalyticDistribution extends Component {
             },
             isToMany: false,
             onRecordSaved: async (record) => {
-                this.mainRef.el.focus();
+                if (!this.props.record.model.multiEdit) {
+                    this.mainRef.el.focus();
+                }
             },
             onClose: () => {
-                this.mainRef.el.focus();
+                if (!this.props.record.model.multiEdit) {
+                    this.mainRef.el.focus();
+                }
             },
             fieldString: _t("Analytic Distribution Template"),
         });