diff --git a/capsule-prototype/js/PopupPanelWidget.js b/capsule-prototype/js/PopupPanelWidget.js
index cd588f079bb370b3de49eaad42fb34e53efe8006..83e0f6602a57d4a6d36712b5c8f5577868dae73e 100644
--- a/capsule-prototype/js/PopupPanelWidget.js
+++ b/capsule-prototype/js/PopupPanelWidget.js
@@ -851,11 +851,12 @@ PopupPanelWidget.prototype.createPopupContent = function (tag) {
             .attr('id', 'popupImgBox');
 
         let image = $('<img src="" alt="">');
+        let fileDirectLink = this.getDownloadLink();
         if (this.isMarker()) {
             image.attr('src', "../shared/css/images/img-note.png");
         } else {
             if (this.thumbnail.url) {
-                image.attr("src", this.getDownloadLink() || this.thumbnail.url);
+                image.attr("src", fileDirectLink || this.thumbnail.url);
             } else {
                 let type = this.getMetadata("Rekall->Type");
                 if (type.indexOf("image") > -1) image.attr("src", "../shared/css/images/img-image.png")
@@ -875,7 +876,7 @@ PopupPanelWidget.prototype.createPopupContent = function (tag) {
                     if (that.isLink()) {
                         if (that.getMetadata("Rekall->Link")) window.open(that.getMetadata("Rekall->Link"), '_blank')
                     } else {
-                        window.open(image.attr('src'), '_blank');
+                        window.open(fileDirectLink, '_blank');
                     }
                 });
         }