diff --git a/InvenTree/templates/js/dynamic/inventree.js b/InvenTree/templates/js/dynamic/inventree.js
index 7513b4863a..1b7898478c 100644
--- a/InvenTree/templates/js/dynamic/inventree.js
+++ b/InvenTree/templates/js/dynamic/inventree.js
@@ -140,11 +140,13 @@ function inventreeDocReady() {
                     offset: 0
                 },
                 success: function(data) {
+
                     var transformed = $.map(data.results, function(el) {
                         return {
                             label: el.full_name,
                             id: el.pk,
-                            thumbnail: el.thumbnail
+                            thumbnail: el.thumbnail,
+                            data: el,
                         };
                     });
                     response(transformed);
@@ -164,7 +166,16 @@ function inventreeDocReady() {
                 html += `'> `;
                 html += item.label;
 
-                html += '</span></a>';
+                html += '</span>';
+                
+                html += partStockLabel(
+                    item.data,
+                    {
+                        label_class: 'label-right',
+                    }
+                );
+                
+                html += '</a>';
 
                 return $('<li>').append(html).appendTo(ul);
             };
diff --git a/InvenTree/templates/js/translated/model_renderers.js b/InvenTree/templates/js/translated/model_renderers.js
index 0bb0818a70..bf3628d656 100644
--- a/InvenTree/templates/js/translated/model_renderers.js
+++ b/InvenTree/templates/js/translated/model_renderers.js
@@ -168,11 +168,7 @@ function renderPart(name, data, parameters, options) {
 
     // Display available part quantity
     if (user_settings.PART_SHOW_QUANTITY_IN_FORMS) {
-        if (data.in_stock == 0) {
-            extra += `<span class='label-form label-red'>{% trans "No Stock" %}</span>`;
-        } else {
-            extra += `<span class='label-form label-green'>{% trans "Stock" %}: ${data.in_stock}</span>`;
-        }
+        extra += partStockLabel(data);
     }
 
     if (!data.active) {
diff --git a/InvenTree/templates/js/translated/part.js b/InvenTree/templates/js/translated/part.js
index f4ee237d84..0de423b489 100644
--- a/InvenTree/templates/js/translated/part.js
+++ b/InvenTree/templates/js/translated/part.js
@@ -35,6 +35,7 @@
     loadSellPricingChart,
     loadSimplePartTable,
     loadStockPricingChart,
+    partStockLabel,
     toggleStar,
 */
 
@@ -409,6 +410,18 @@ function toggleStar(options) {
 }
 
 
+function partStockLabel(part, options={}) {
+
+    var label_class = options.label_class || 'label-form';
+
+    if (part.in_stock) {
+        return `<span class='label ${label_class} label-green'>{% trans "Stock" %}: ${part.in_stock}</span>`;
+    } else {
+        return `<span class='label ${label_class} label-red'>{% trans "No Stock" %}</span>`;
+    }
+}
+
+
 function makePartIcons(part) {
     /* Render a set of icons for the given part.
      */