diff --git a/app/helpers/spree/admin/orders_helper.rb b/app/helpers/spree/admin/orders_helper.rb
index 71970c53d3..fc4f21baa8 100644
--- a/app/helpers/spree/admin/orders_helper.rb
+++ b/app/helpers/spree/admin/orders_helper.rb
@@ -34,6 +34,10 @@ module Spree
         links
       end
 
+      def order_shipment_ready?(order)
+        order.ready_to_ship?
+      end
+
       private
 
       def complete_order_links(order)
diff --git a/app/views/spree/admin/shared/_order_links.html.haml b/app/views/spree/admin/shared/_order_links.html.haml
index a0643a4146..a79cf3b2f5 100644
--- a/app/views/spree/admin/shared/_order_links.html.haml
+++ b/app/views/spree/admin/shared/_order_links.html.haml
@@ -6,10 +6,8 @@
           %i.icon-check
           = I18n.t 'admin.actions'
       %div.menu{"data-action": "click->dropdown#closeOnMenu"}
-        - shipment_ready = false
         - order_links(@order).each do |link|
           - if link[:name] == t(:ship_order)
-            - shipment_ready = true 
             %a.menu_item{ href: link[:url], target: link[:target] || "_self", data: { "modal-link-target-value": dom_id(@order, :ship), "action":  "click->modal-link#open", "controller": "modal-link" } }
               %span
                 %i{ class: link[:icon] }
@@ -21,6 +19,6 @@
               %span=link[:name]
 
 = render 'spree/admin/shared/custom-confirm'
-- if shipment_ready
+- if order_shipment_ready?(@order)
   %form
     = render ShipOrderComponent.new(order: @order)