diff --git a/src/Services/Attachments/AttachmentSubmitHandler.php b/src/Services/Attachments/AttachmentSubmitHandler.php
index 9fbc3fe3..c7e69257 100644
--- a/src/Services/Attachments/AttachmentSubmitHandler.php
+++ b/src/Services/Attachments/AttachmentSubmitHandler.php
@@ -30,6 +30,7 @@ use App\Entity\Attachments\AttachmentUpload;
 use App\Entity\Attachments\CategoryAttachment;
 use App\Entity\Attachments\CurrencyAttachment;
 use App\Entity\Attachments\LabelAttachment;
+use App\Entity\Attachments\PartCustomStateAttachment;
 use App\Entity\Attachments\ProjectAttachment;
 use App\Entity\Attachments\FootprintAttachment;
 use App\Entity\Attachments\GroupAttachment;
@@ -80,6 +81,7 @@ class AttachmentSubmitHandler
         //The mapping used to determine which folder will be used for an attachment type
         $this->folder_mapping = [
             PartAttachment::class => 'part',
+            PartCustomStateAttachment::class => 'part_custom_state',
             AttachmentTypeAttachment::class => 'attachment_type',
             CategoryAttachment::class => 'category',
             CurrencyAttachment::class => 'currency',
diff --git a/src/Services/Attachments/PartPreviewGenerator.php b/src/Services/Attachments/PartPreviewGenerator.php
index ef13265f..9aedba74 100644
--- a/src/Services/Attachments/PartPreviewGenerator.php
+++ b/src/Services/Attachments/PartPreviewGenerator.php
@@ -104,13 +104,6 @@ class PartPreviewGenerator
             }
         }
 
-        if ($part->getPartCustomState() instanceof PartCustomState) {
-            $attachment = $part->getPartCustomState()->getMasterPictureAttachment();
-            if ($this->isAttachmentValidPicture($attachment)) {
-                $list[] = $attachment;
-            }
-        }
-
         if ($part->getManufacturer() instanceof Manufacturer) {
             $attachment = $part->getManufacturer()->getMasterPictureAttachment();
             if ($this->isAttachmentValidPicture($attachment)) {
diff --git a/templates/parts/info/_sidebar.html.twig b/templates/parts/info/_sidebar.html.twig
index 28eada04..0c353d8f 100644
--- a/templates/parts/info/_sidebar.html.twig
+++ b/templates/parts/info/_sidebar.html.twig
@@ -36,6 +36,19 @@
     </div>
 {% endif %}
 
+{% if part.partCustomState is not null %}
+    <div class="mt-1">
+        <h6>
+            <span class="badge bg-primary" title="{% trans %}part_custom_state.caption{% endtrans %}"><i class="fas fa-tools fa-fw"></i> {{ part.partCustomState.name }}</span>
+
+            {% if part.partCustomState is not null and part.partCustomState.masterPictureAttachment and attachment_manager.fileExisting(part.partCustomState.masterPictureAttachment) %}
+                <br/>
+                <img class="img-fluid img-thumbnail thumbnail-sm" src="{{ attachment_thumbnail(part.partCustomState.masterPictureAttachment, 'thumbnail_md') }}" alt="{% trans %}attachment.preview.alt{% endtrans %}" />
+            {% endif %}
+        </h6>
+    </div>
+{% endif %}
+
 {# Favorite Status tag #}
 {% if part.favorite %}
     <div class="mt-1">
@@ -79,4 +92,4 @@
             </a>
         </h6>
     </div>
-{% endif %}
\ No newline at end of file
+{% endif %}