diff --git a/src/sunstone/public/app/utils/panel/template-table.js b/src/sunstone/public/app/utils/panel/template-table.js
index c08758b877..dd847211c9 100644
--- a/src/sunstone/public/app/utils/panel/template-table.js
+++ b/src/sunstone/public/app/utils/panel/template-table.js
@@ -430,7 +430,11 @@ define(function(require) {
               modify
           );
         } else {
-          str += '<tr><td class="key_td">' + Locale.tr(field) + '</td><td class="value_td" id="value_td_input_' + field + '">' + TemplateUtils.htmlEncode(value) + '</td>';
+          str += '<tr><td class="key_td">' + Locale.tr(field) + '</td><td class="value_td" id="value_td_input_' + field + '">';
+          str += (field.toLowerCase() === "link")
+            ? '<a target="_blank" href="'+TemplateUtils.htmlEncode(value)+'">' + TemplateUtils.htmlEncode(value) + '</a></td>'
+            : TemplateUtils.htmlEncode(value) + '</td>';
+          
           if (modify) {
             var edit_html = "";
             var delete_html = "";