diff --git a/app/views/shared/menu/_cart.html.haml b/app/views/shared/menu/_cart.html.haml
index 2d8fbebcb9..907fda0eff 100644
--- a/app/views/shared/menu/_cart.html.haml
+++ b/app/views/shared/menu/_cart.html.haml
@@ -1,4 +1,4 @@
-%span.cart-span{"ng-controller" => "CartCtrl"}
+%span.cart-span{"ng-controller" => "CartCtrl", "ng-class" => "{ dirty: Cart.dirty }"}
   %a#cart.icon{cart: true}
     %span.nav-branded 
       %i.ofn-i_027-shopping-cart
diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb
index 288e628b38..56c578f91b 100644
--- a/spec/features/consumer/shopping/shopping_spec.rb
+++ b/spec/features/consumer/shopping/shopping_spec.rb
@@ -139,7 +139,9 @@ feature "As a consumer I want to shop with a distributor", js: true do
         it "should save group buy data to ze cart" do
           fill_in "variants[#{product.master.id}]", with: 5
           fill_in "variant_attributes[#{product.master.id}][max_quantity]", with: 9
-          sleep 5
+
+          wait_until { !cart_dirty }
+
           li = Spree::Order.order(:created_at).last.line_items.order(:created_at).last
           li.max_quantity.should == 9
           li.quantity.should == 5
diff --git a/spec/support/request/ui_component_helper.rb b/spec/support/request/ui_component_helper.rb
index 7ca025e235..d9f01b447b 100644
--- a/spec/support/request/ui_component_helper.rb
+++ b/spec/support/request/ui_component_helper.rb
@@ -68,6 +68,10 @@ module UIComponentHelper
     find("#cart").click
   end
 
+  def cart_dirty
+    page.find("span.cart-span")[:class].include? 'dirty'
+  end
+
   def wait_for_ajax
     counter = 0
     while page.execute_script("return $.active").to_i > 0