diff --git a/app/assets/javascripts/assets.js b/app/assets/javascripts/assets.js
index e80c95e05..c0fa1e265 100644
--- a/app/assets/javascripts/assets.js
+++ b/app/assets/javascripts/assets.js
@@ -26,9 +26,12 @@ function setupAssetsLoading() {
 
           if (data.type === "image") {
             $el.html(
+              "<a class='image-preview-link' id='modal_link" +
+              data['asset-id'] + "' data-status='asset-present' " +
+              "href='" + data['download-url'] + "'>" +
               "<img src='" + data['image-tag-url'] + "' data-preview-url='" +
               data['preview-url'] + "'><p>" +
-              data.filename + "</p>"
+              data.filename + '</p></a>'
             );
           } else {
             $el.html(
diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb
index 9c0ff9c18..badb98a9a 100644
--- a/app/controllers/assets_controller.rb
+++ b/app/controllers/assets_controller.rb
@@ -19,6 +19,7 @@ class AssetsController < ApplicationController
 
           # If check permission passes, return :ok
           render json: {
+            'asset-id' => @asset.id,
             'image-tag-url' => @asset.url(:medium),
             'preview-url' => large_image_url_asset_path(@asset),
             'filename' => truncate(@asset.file_file_name,