diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index 3725d79c7b..b4943a9b9a 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -112,6 +112,10 @@
     font-size: 100%;
 }
 
+.label-right {
+    float: right;
+}
+
 /* Bootstrap table overrides */
 
 .stock-sub-group td {
diff --git a/InvenTree/InvenTree/static/script/inventree/part.js b/InvenTree/InvenTree/static/script/inventree/part.js
index 693a4d1faa..f05c5670da 100644
--- a/InvenTree/InvenTree/static/script/inventree/part.js
+++ b/InvenTree/InvenTree/static/script/inventree/part.js
@@ -182,25 +182,27 @@ function loadPartTable(table, url, options={}) {
         searchable: false,
         sortable: true,
         formatter: function(value, row, index, field) {            
-            var html = "";
             var link = "stock";
-
+            
             if (value) {
+                // There IS stock available for this part
 
-                if (row.units) {
-                    value += ' <i><small>' + row.units + '</small></i>';
+                // Is stock "low" (below the 'minimum_stock' quantity)?
+                if (row.minimum_stock && row.minimum_stock > value) {
+                    value += "<span class='label label-right label-warning'>Low stock</span>";
                 }
 
-                html = value;
-
             } else if (row.on_order) {
-                value = "<span class='label label-primary'>On Order : " + row.on_order + "</span>";
+                // There is no stock available, but stock is on order
+                value = "0<span class='label label-right label-primary'>On Order : " + row.on_order + "</span>";
                 link = "orders";
             } else if (row.building) {
-                value = "<span class='label label-info'>Building : " + row.building + "</span>";
+                // There is no stock available, but stock is being built
+                value = "0<span class='label label-right label-info'>Building : " + row.building + "</span>";
                 link = "builds";
             } else {
-                value ="<span class='label label-warning'>No Stock</span>";
+                // There is no stock available
+                value = "0<span class='label label-right label-danger'>No Stock</span>";
             }
             
             return renderLink(value, '/part/' + row.pk + "/" + link + "/");
diff --git a/InvenTree/part/api.py b/InvenTree/part/api.py
index 1d6aaa84aa..2a96a47fef 100644
--- a/InvenTree/part/api.py
+++ b/InvenTree/part/api.py
@@ -178,6 +178,7 @@ class PartList(generics.ListCreateAPIView):
             'is_template',
             'URL',
             'units',
+            'minimum_stock',
             'trackable',
             'assembly',
             'component',
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