diff --git a/client/components/cards/attachments.js b/client/components/cards/attachments.js
index d28b88004..48b100cfe 100644
--- a/client/components/cards/attachments.js
+++ b/client/components/cards/attachments.js
@@ -231,14 +231,20 @@ Template.attachmentViewer.events({
   'click #viewer-container'(event) {
 
     // Make sure the click was on #viewer-container and not on any of its children
-    if(event.target !== event.currentTarget) return;
+    if(event.target !== event.currentTarget) {
+      event.stopPropagation();
+      return;
+    }
 
     closeAttachmentViewer();
   },
   'click #viewer-content'(event) {
 
     // Make sure the click was on #viewer-content and not on any of its children
-    if(event.target !== event.currentTarget) return;
+    if(event.target !== event.currentTarget) {
+      event.stopPropagation();
+      return;
+    }
 
     closeAttachmentViewer();
   },