diff --git a/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js b/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js
index cda1885719e..539df5b2fed 100644
--- a/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js
+++ b/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js
@@ -1,7 +1,6 @@
 /** @odoo-module **/
 
 import { useUpdate } from '@mail/component_hooks/use_update';
-import { replace } from '@mail/model/model_field_command';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
 
 const { Component } = owl;
@@ -94,10 +93,7 @@ export class ComposerSuggestion extends Component {
      */
     _onClick(ev) {
         ev.preventDefault();
-        this.composerView.update({ activeSuggestion: replace(this.composerSuggestion) });
-        this.composerView.insertSuggestion();
-        this.composerView.closeSuggestions();
-        this.composerView.update({ doFocus: true });
+        this.composerView.onClickSuggestion(this.composerSuggestion);
     }
 
 }
diff --git a/addons/mail/static/src/models/composer_view.js b/addons/mail/static/src/models/composer_view.js
index 45c5e4fb660..d5d64b85a68 100644
--- a/addons/mail/static/src/models/composer_view.js
+++ b/addons/mail/static/src/models/composer_view.js
@@ -247,6 +247,15 @@ registerModel({
                 replyingToMessageView: clear(),
             });
         },
+        /**
+         * @param {ComposerSuggestion} suggestion 
+         */
+        onClickSuggestion(suggestion) {
+            this.update({ activeSuggestion: replace(suggestion) });
+            this.insertSuggestion();
+            this.closeSuggestions();
+            this.update({ doFocus: true });
+        },
         /**
          * @private
          * @param {KeyboardEvent} ev