diff --git a/InvenTree/order/templates/order/sales_order_detail.html b/InvenTree/order/templates/order/sales_order_detail.html
index bc2c481eae..00314e8fe1 100644
--- a/InvenTree/order/templates/order/sales_order_detail.html
+++ b/InvenTree/order/templates/order/sales_order_detail.html
@@ -37,8 +37,8 @@
     </div>
 </div>
 
+{% if order.is_pending %}
 <div class='panel panel-hidden' id='panel-order-shipments'>
-    {% if order.is_pending %}
     <div class='panel-heading'>
         <div class='d-flex flex-row'>
             <h4>{% trans "Pending Shipments" %}</h4>
@@ -57,7 +57,10 @@
         {% endif %}
         <table class='table table-striped table-condensed' id='pending-shipments-table' data-toolbar='#pending-shipment-toolbar'></table>
     </div>
-    {% endif %}
+</div>
+{% endif %}
+
+<div class='panel panel-hidden' id='panel-order-shipments-complete'>
     <div class='panel-heading'>
         <h4>{% trans "Completed Shipments" %}</h4>
     </div>
diff --git a/InvenTree/order/templates/order/so_sidebar.html b/InvenTree/order/templates/order/so_sidebar.html
index c18c766e6c..c43e0537c5 100644
--- a/InvenTree/order/templates/order/so_sidebar.html
+++ b/InvenTree/order/templates/order/so_sidebar.html
@@ -4,8 +4,12 @@
 
 {% trans "Line Items" as text %}
 {% include "sidebar_item.html" with label='order-items' text=text icon="fa-list-ol" %}
-{% trans "Shipments" as text %}
-{% include "sidebar_item.html" with label='order-shipments' text=text icon="fa-truck" %}
+{% if order.is_pending %}
+{% trans "Pending Shipments" as text %}
+{% include "sidebar_item.html" with label='order-shipments' text=text icon="fa-truck-loading" %}
+{% endif %}
+{% trans "Completed Shipments" as text %}
+{% include "sidebar_item.html" with label='order-shipments-complete' text=text icon="fa-truck" %}
 {% trans "Build Orders" as text %}
 {% include "sidebar_item.html" with label='order-builds' text=text icon="fa-tools" %}
 {% trans "Attachments" as text %}