diff --git a/addons/mail/static/src/components/composer_suggestion_view/composer_suggestion_view.js b/addons/mail/static/src/components/composer_suggestion_view/composer_suggestion_view.js
index 3cc0debf443..dc2260f59f4 100644
--- a/addons/mail/static/src/components/composer_suggestion_view/composer_suggestion_view.js
+++ b/addons/mail/static/src/components/composer_suggestion_view/composer_suggestion_view.js
@@ -36,13 +36,13 @@ export class ComposerSuggestionView extends Component {
     _update() {
         if (
             this.root.el &&
-            this.composerSuggestionView.composerViewOwner.hasToScrollToActiveSuggestionView &&
+            this.composerSuggestionView.composerSuggestionListViewOwner.composerViewOwner.hasToScrollToActiveSuggestionView &&
             this.composerSuggestionView.composerViewOwnerAsActiveSuggestionView
         ) {
             this.root.el.scrollIntoView({
                 block: 'center',
             });
-            this.composerSuggestionView.composerViewOwner.update({ hasToScrollToActiveSuggestionView: false });
+            this.composerSuggestionView.composerSuggestionListViewOwner.composerViewOwner.update({ hasToScrollToActiveSuggestionView: false });
         }
     }
 
diff --git a/addons/mail/static/src/models/composer_suggestion_view.js b/addons/mail/static/src/models/composer_suggestion_view.js
index d664f6021e2..2af81f328b9 100644
--- a/addons/mail/static/src/models/composer_suggestion_view.js
+++ b/addons/mail/static/src/models/composer_suggestion_view.js
@@ -20,21 +20,22 @@ registerModel({
          */
         onClick(ev) {
             ev.preventDefault();
-            this.composerViewOwner.update({ activeSuggestionView: replace(this) });
-            this.composerViewOwner.insertSuggestion();
-            this.composerViewOwner.closeSuggestions();
-            this.composerViewOwner.update({ doFocus: true });
+            this.composerSuggestionListViewOwner.composerViewOwner.update({ activeSuggestionView: replace(this) });
+            const composerViewOwner = this.composerSuggestionListViewOwner.composerViewOwner;
+            composerViewOwner.insertSuggestion();
+            composerViewOwner.closeSuggestions();
+            composerViewOwner.update({ doFocus: true });
         },
          /**
          * @private
          * @returns {FieldCommand}
          */
-        _computeComposerViewOwner() {
+        _computeComposerSuggestionListViewOwner() {
             if (this.composerSuggestionListViewOwnerAsExtraSuggestion) {
-                return replace(this.composerSuggestionListViewOwnerAsExtraSuggestion.composerViewOwner);
+                return replace(this.composerSuggestionListViewOwnerAsExtraSuggestion);
             }
             if (this.composerSuggestionListViewOwnerAsMainSuggestion) {
-                return replace(this.composerSuggestionListViewOwnerAsMainSuggestion.composerViewOwner);
+                return replace(this.composerSuggestionListViewOwnerAsMainSuggestion);
             }
             return clear();
         },
@@ -87,8 +88,8 @@ registerModel({
         },
     },
     fields: {
-        composerViewOwner: one('ComposerView', {
-            compute: '_computeComposerViewOwner',
+        composerSuggestionListViewOwner: one('ComposerSuggestionListView', {
+            compute: '_computeComposerSuggestionListViewOwner',
             required: true,
         }),
         composerViewOwnerAsActiveSuggestionView: one('ComposerView', {