diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29a4ab2..68e0580 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ See [keep a changelog] for information about writing changes to this log.
 
 ## [Unreleased]
 
+[PR-16](https://github.com/itk-dev/itqr/pull/16)
+    - Changed url in list to link to redirect path
 [PR-13](https://github.com/itk-dev/itqr/pull/13)
     - Added download functionality
     - Preview QR code before download
diff --git a/templates/fields/link/link.html.twig b/templates/fields/link/link.html.twig
index e0c594f..c115782 100644
--- a/templates/fields/link/link.html.twig
+++ b/templates/fields/link/link.html.twig
@@ -1,9 +1,9 @@
-{% set generate_qr_url = app_base_generate_path ~ app_base_redirect_path ~ entity.instance.uuid %}
+{% set generate_qr_url = app_base_redirect_path ~ entity.instance.uuid %}
 
-<a href="{{ generate_qr_url }}" target="_blank" class="popover-link">
+<a href="{{ qr_code_data_uri(generate_qr_url) }}" target="_blank" class="popover-link">
     View
     <span class="popover-content">
-       <img src="{{ generate_qr_url }}" alt="Generated Image" />
+       <img src="{{ qr_code_data_uri(generate_qr_url) }}" alt="Generated Image" />
    </span>
 </a>