diff --git a/app/views/spree/orders/_form.html.haml b/app/views/spree/orders/_form.html.haml
index e19d2bd960..0b5d2d9444 100644
--- a/app/views/spree/orders/_form.html.haml
+++ b/app/views/spree/orders/_form.html.haml
@@ -22,7 +22,7 @@
       = render 'bought' if show_bought_items? && @order.cart?
 
       %tfoot#edit-cart
-        = render 'spree/orders/form/cart_actions_row' if @order.cart?
+        = render 'spree/orders/form/cart_actions_row' unless @order.complete?
 
         %tr
           %td.text-right{colspan:"3"}
diff --git a/spec/system/consumer/split_checkout_spec.rb b/spec/system/consumer/split_checkout_spec.rb
index 774c753a0d..294c9cdaa9 100644
--- a/spec/system/consumer/split_checkout_spec.rb
+++ b/spec/system/consumer/split_checkout_spec.rb
@@ -169,11 +169,7 @@ describe "As a consumer, I want to checkout my order", js: true do
         expect(page).to have_current_path("/checkout/payment")
       end
 
-      context "when I have an out of stock product in my cart" do
-        pending("awaiting closure bug #8940") do
-          it_behaves_like "when I have an out of stock product in my cart"
-        end
-      end
+      it_behaves_like "when I have an out of stock product in my cart"
     end
   end