diff --git a/InvenTree/templates/js/translated/bom.js b/InvenTree/templates/js/translated/bom.js
index e1650e14fe..c8ed1c0541 100644
--- a/InvenTree/templates/js/translated/bom.js
+++ b/InvenTree/templates/js/translated/bom.js
@@ -1155,7 +1155,7 @@ function loadBomTable(table, options={}) {
 
             var available_stock = availableQuantity(row);
 
-            var text = `${available_stock}`;
+            var text = renderLink(`${available_stock}`, url);
 
             if (row.sub_part_detail && row.sub_part_detail.units) {
                 text += ` <small>${row.sub_part_detail.units}</small>`;
@@ -1179,8 +1179,6 @@ function loadBomTable(table, options={}) {
                 }
             }
 
-            text = renderLink(text, url);
-
             if (row.on_order && row.on_order > 0) {
                 text += makeIconBadge(
                     'fa-shopping-cart',
diff --git a/InvenTree/templates/js/translated/model_renderers.js b/InvenTree/templates/js/translated/model_renderers.js
index 87c08de53e..810adf32cb 100644
--- a/InvenTree/templates/js/translated/model_renderers.js
+++ b/InvenTree/templates/js/translated/model_renderers.js
@@ -129,15 +129,19 @@ function renderModel(data, options={}) {
         }
     }
 
-    let text = `<span>${data.text}</span>`;
+    let text = data.text;
+
+    if (showLink && data.url) {
+        text = renderLink(text, data.url);
+    }
+
+    text = `<span>${text}</span>`;
 
     if (data.textSecondary) {
         text += ` - <small><em>${data.textSecondary}</em></small>`;
     }
 
-    if (showLink && data.url) {
-        text = renderLink(text, data.url);
-    }
+
 
     html += text;