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();
   },
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index 5c48e66b5..5f9d5e9da 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -2,6 +2,9 @@ template(name="cardDetailsPopup")
   +cardDetails(popupCard)
 
 template(name="cardDetails")
+
+  +attachmentViewer
+
   section.card-details.js-card-details(class='{{#if cardMaximized}}card-details-maximized{{/if}}' class='{{#if isPopup}}card-details-popup{{/if}}'): .card-details-canvas
     .card-details-header(class='{{#if colorClass}}card-details-{{colorClass}}{{/if}}')
       +inlinedForm(classNames="js-card-details-title")
@@ -562,7 +565,6 @@ template(name="cardDetails")
             br
           | {{_ 'invalid-file'}}
           .card-checklist-attachmentGallery.card-attachmentGallery
-            +attachmentViewer
             +attachmentGallery
       hr