diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index 585c0b3825..d3f17074fa 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -242,6 +242,13 @@
     border-color: var(--label-red);
 }
 
+.label-form {
+    margin: 2px;
+    padding-left: 4px;
+    padding-right: 4px;
+    border-radius: 5px;
+}
+
 .label-red {
     background: var(--label-red);
 }
diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py
index aed6f2bf14..fd64e2a042 100644
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@@ -648,7 +648,6 @@ class InvenTreeSetting(BaseInvenTreeSetting):
             'validator': bool,
         },
 
-        # TODO: Remove this setting in future, new API forms make this not useful
         'PART_SHOW_QUANTITY_IN_FORMS': {
             'name': _('Show Quantity in Forms'),
             'description': _('Display available part quantity in some forms'),
diff --git a/InvenTree/templates/js/translated/model_renderers.js b/InvenTree/templates/js/translated/model_renderers.js
index 0c3dabc27e..37d236f41e 100644
--- a/InvenTree/templates/js/translated/model_renderers.js
+++ b/InvenTree/templates/js/translated/model_renderers.js
@@ -159,7 +159,24 @@ function renderPart(name, data, parameters, options) {
         html += ` - <i>${data.description}</i>`;
     }
 
-    html += `<span class='float-right'><small>{% trans "Part ID" %}: ${data.pk}</small></span>`;
+    var stock = '';
+
+    // Display available part quantity
+    if (global_settings.PART_SHOW_QUANTITY_IN_FORMS) {
+        if (data.in_stock == 0) {
+            stock = `<span class='label-form label-red'>{% trans "No Stock" %}</span>`;
+        } else {
+            stock = `<span class='label-form label-green'>{% trans "In Stock" %}: ${data.in_stock}</span>`;
+        }
+    }
+
+    html += `
+    <span class='float-right'>
+        <small>
+            ${stock}
+            {% trans "Part ID" %}: ${data.pk}
+            </small>
+    </span>`;
 
     return html;
 }