diff --git a/addons/mail/static/src/components/attachment_viewer/attachment_viewer.js b/addons/mail/static/src/components/attachment_viewer/attachment_viewer.js
index 2b43c5a17bd..7a42d2b92d1 100644
--- a/addons/mail/static/src/components/attachment_viewer/attachment_viewer.js
+++ b/addons/mail/static/src/components/attachment_viewer/attachment_viewer.js
@@ -269,21 +269,6 @@ export class AttachmentViewer extends Component {
     // Handlers
     //--------------------------------------------------------------------------
 
-    /**
-     * Called when clicking on mask of attachment viewer.
-     *
-     * @private
-     * @param {MouseEvent} ev
-     */
-    _onClick(ev) {
-        if (this.attachmentViewer.isDragging) {
-            return;
-        }
-        // TODO: clicking on the background should probably be handled by the dialog?
-        // task-2092965
-        this.attachmentViewer.close();
-    }
-
     /**
      * Called when clicking on cross icon.
      *
diff --git a/addons/mail/static/src/components/attachment_viewer/attachment_viewer.xml b/addons/mail/static/src/components/attachment_viewer/attachment_viewer.xml
index 2a96b8e42c2..f7561bd5195 100644
--- a/addons/mail/static/src/components/attachment_viewer/attachment_viewer.xml
+++ b/addons/mail/static/src/components/attachment_viewer/attachment_viewer.xml
@@ -3,7 +3,7 @@
 
     <t t-name="mail.AttachmentViewer" owl="1">
         <t t-if="attachmentViewer">
-            <div class="o_AttachmentViewer flex-column align-items-center d-flex w-100 h-100" t-attf-class="{{ className }}" t-on-click="_onClick" t-on-keydown="_onKeydown" tabindex="0" t-ref="root">
+            <div class="o_AttachmentViewer flex-column align-items-center d-flex w-100 h-100" t-attf-class="{{ className }}" t-on-click="attachmentViewer.onClick" t-on-keydown="_onKeydown" tabindex="0" t-ref="root">
                 <div class="o_AttachmentViewer_header d-flex w-100 bg-black-75 text-400" t-on-click="_onClickHeader">
                     <t t-if="attachmentViewer.attachment.isViewable">
                         <div class="o_AttachmentViewer_headerItem o_AttachmentViewer_icon d-flex align-items-center ms-4 me-2">
diff --git a/addons/mail/static/src/models/attachment_viewer.js b/addons/mail/static/src/models/attachment_viewer.js
index 9123e61b594..9f7c815cc2b 100644
--- a/addons/mail/static/src/models/attachment_viewer.js
+++ b/addons/mail/static/src/models/attachment_viewer.js
@@ -22,6 +22,19 @@ registerModel({
         containsElement(element) {
             return Boolean(this.component && this.component.root.el && this.component.root.el.contains(element));
         },
+        /**
+         * Called when clicking on mask of attachment viewer.
+         *
+         * @param {MouseEvent} ev
+         */
+        onClick(ev) {
+            if (this.isDragging) {
+                return;
+            }
+            // TODO: clicking on the background should probably be handled by the dialog?
+            // task-2092965
+            this.close();
+        },
         /**
          * @private
          * @returns {string}