diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py
index 06b79417d1..e5497faa4c 100644
--- a/InvenTree/part/models.py
+++ b/InvenTree/part/models.py
@@ -247,6 +247,15 @@ class Part(models.Model):
 
         return total
 
+    def isStarredBy(self, user):
+        """ Return True if this part has been starred by a particular user """
+
+        try:
+            PartStar.objects.get(part=self, user=user)
+            return True
+        except PartStar.DoesNotExist:
+            return False
+
     def need_to_restock(self):
         """ Return True if this part needs to be restocked
         (either by purchasing or building).
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 4ee5665be7..7381332892 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -28,7 +28,9 @@
         <p>
             <div class='btn-group'>
                 <button type='button' class='btn btn-default btn-glyph' id='show-qr-code' title='Show QR code'><span class='glyphicon glyphicon-qrcode'></span></button>
-                <button type='button' class='btn btn-default btn-glyph' id='toggle-starred' title='Star this part'><span id='part-star-icon' class='glyphicon glyphicon-star-empty'/></button>
+                <button type='button' class='btn btn-default btn-glyph' id='toggle-starred' title='Star this part'>
+                    <span id='part-star-icon' class='glyphicon {% if starred %}glyphicon-star{% else %}glyphicon-star-empty{% endif %}'/>
+                </button>
             </div>
         </p>
         <table class='table table-condensed'>
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index 6ba810b67d..c97808888e 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -232,6 +232,10 @@ class PartDetail(DetailView):
         else:
             context['editing_enabled'] = 0
 
+        part = self.get_object()
+
+        context['starred'] = part.isStarredBy(self.request.user)
+
         return context