diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 27e5aedb83..7eb2f1dc5a 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -98,7 +98,7 @@
         </tr>
         <tr>
             <td>{% trans "In Stock" %}</td>
-            <td>{% decimal part.total_stock %}</td>
+            <td>{% include "part/stock_count.html" %}</td>
         </tr>
         {% if not part.is_template %}
         {% if part.allocation_count > 0 %}
diff --git a/InvenTree/part/templates/part/stock_count.html b/InvenTree/part/templates/part/stock_count.html
new file mode 100644
index 0000000000..07b3ac9c9b
--- /dev/null
+++ b/InvenTree/part/templates/part/stock_count.html
@@ -0,0 +1,10 @@
+{% load inventree_extras %}
+{% load i18n %}
+
+{% decimal part.total_stock %}
+
+{% if part.total_stock == 0 %}
+<span class='label label-danger'>{% trans "No Stock" %}</span>
+{% elif part.total_stock < part.minimum_stock %}
+<span class='label label-warning'>{% trans "Low Stock" %}</span>
+{% endif %}
\ No newline at end of file