diff --git a/InvenTree/templates/js/modals.js b/InvenTree/templates/js/modals.js
index f447fdce72..c8ebd90eb4 100644
--- a/InvenTree/templates/js/modals.js
+++ b/InvenTree/templates/js/modals.js
@@ -978,6 +978,7 @@ function showModalImage(image_url) {
     // Set image content
     $('#modal-image').attr('src', image_url);
 
+    modal.hide();
     modal.show();
 
     modal.animate({
diff --git a/InvenTree/templates/js/part.js b/InvenTree/templates/js/part.js
index 52f54dfa36..a5b6def921 100644
--- a/InvenTree/templates/js/part.js
+++ b/InvenTree/templates/js/part.js
@@ -288,7 +288,13 @@ function partGridTile(part) {
         rows += `<tr><td><b>{% trans "IPN" %}</b></td><td>${part.IPN}</td></tr>`;
     }
 
-    rows += `<tr><td><b>{% trans "Stock" %}</b></td><td>${part.in_stock}</td></tr>`;
+    var stock = `${part.in_stock}`;
+
+    if (!part.in_stock) {
+        stock = `<span class='label label-red'>{% trans "No Stock" %}</label>`;
+    }
+
+    rows += `<tr><td><b>{% trans "Stock" %}</b></td><td>${stock}</td></tr>`;
 
     if (part.on_order) {
         rows += `<tr><td><b>{$ trans "On Order" %}</b></td><td>${part.on_order}</td></tr>`;
@@ -313,7 +319,7 @@ function partGridTile(part) {
             <div class='panel-content'>
                 <div class='row'>
                     <div class='col-sm-6'>
-                        <img src='${part.thumbnail}' class='card-thumb'>
+                        <img src='${part.thumbnail}' class='card-thumb' onclick='showModalImage("${part.image}")'>
                     </div>
                     <div class='col-sm-6'>
                         <table class='table table-striped table-condensed'>