diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py
index 446ab65a56..b5a88d4e66 100644
--- a/InvenTree/stock/models.py
+++ b/InvenTree/stock/models.py
@@ -122,6 +122,11 @@ class StockItem(models.Model):
                 system=True
             )
 
+    @property
+    def serialized(self):
+        """ Return True if this StockItem is serialized """
+        return self.serial is not None and self.quantity == 1
+
     @classmethod
     def check_serial_number(cls, part, serial_number):
         """ Check if a new stock item can be created with the provided part_id
@@ -358,6 +363,14 @@ class StockItem(models.Model):
 
         track.save()
 
+    @transaction.atomic
+    def serializeStock(self, serials, user):
+        """ Split this stock item into unique serial numbers.
+        """
+
+        # TODO
+        pass
+
     @transaction.atomic
     def splitStock(self, quantity, user):
         """ Split this stock item into two items, in the same location.
@@ -372,6 +385,10 @@ class StockItem(models.Model):
             The new item will have a different StockItem ID, while this will remain the same.
         """
 
+        # Do not split a serialized part
+        if self.serialized:
+            return
+
         # Doesn't make sense for a zero quantity
         if quantity <= 0:
             return
@@ -461,6 +478,10 @@ class StockItem(models.Model):
             - False if the StockItem was deleted
         """
 
+        # Do not adjust quantity of a serialized part
+        if self.serialized:
+            return
+
         if quantity < 0:
             quantity = 0
 
@@ -504,6 +525,10 @@ class StockItem(models.Model):
         or by manually adding the items to the stock location
         """
 
+        # Cannot add items to a serialized part
+        if self.serialized:
+            return False
+
         quantity = int(quantity)
 
         # Ignore amounts that do not make sense
@@ -524,6 +549,10 @@ class StockItem(models.Model):
         """ Remove items from stock
         """
 
+        # Cannot remove items from a serialized part
+        if self.serialized:
+            return False
+
         quantity = int(quantity)
 
         if quantity <= 0 or self.infinite:
diff --git a/InvenTree/stock/templates/stock/item.html b/InvenTree/stock/templates/stock/item.html
index f6847d5ae1..97895fd4d2 100644
--- a/InvenTree/stock/templates/stock/item.html
+++ b/InvenTree/stock/templates/stock/item.html
@@ -5,11 +5,16 @@
 <div class='row'>
 <div class='col-sm-6'>
     <h3>Stock Item Details</h3>
+    {% if item.serialized %}
+    <p><i>{{ item.part.full_name}} # {{ item.serial }}</i></p>
+    {% else %}
     <p><i>{{ item.quantity }} &times {{ item.part.full_name }}</i></p>
+    {% endif %}
     <p>
         <div class='btn-group'>
             {% include "qr_button.html" %}
             {% if item.in_stock %}
+            {% if not item.serialized %}
             <button type='button' class='btn btn-default btn-glyph' id='stock-add' title='Add to stock'>
                 <span class='glyphicon glyphicon-plus-sign' style='color: #1a1;'/>
             </button>
@@ -19,6 +24,7 @@
             <button type='button' class='btn btn-default btn-glyph' id='stock-count' title='Count stock'>
                 <span class='glyphicon glyphicon-ok-circle'/>
             </button>
+            {% endif %}
             <button type='button' class='btn btn-default btn-glyph' id='stock-move' title='Transfer stock'>
                 <span class='glyphicon glyphicon-transfer' style='color: #11a;'/>
             </button>
@@ -34,6 +40,11 @@
             </button>
         </div>
     </p>
+    {% if item.serialized %}
+    <div class='alert alert-block alert-info'>
+        This stock item is serialized - it has a unique serial number and the quantity cannot be adjusted.
+    </div>
+    {% endif %}
 </div>
 
 <div class='row'>
@@ -54,9 +65,9 @@
             <td><a href="{% url 'stock-location-detail' item.location.id %}">{{ item.location.name }}</a></td>
         </tr>
         {% endif %}
-        {% if item.serial %}
+        {% if item.serialized %}
         <tr>
-            <td>Serial</td>
+            <td>Serial Number</td>
             <td>{{ item.serial }}</td>
         </tr>
         {% else %}
diff --git a/InvenTree/stock/views.py b/InvenTree/stock/views.py
index b7fbb9f9e4..6fbea9d885 100644
--- a/InvenTree/stock/views.py
+++ b/InvenTree/stock/views.py
@@ -429,6 +429,9 @@ class StockItemEdit(AjaxUpdateView):
             query = query.filter(part=item.part.id)
             form.fields['supplier_part'].queryset = query
 
+        if not item.part.trackable:
+            form.fields.pop('serial')
+
         return form