diff --git a/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
index 79c826165c..d900fd0a27 100644
--- a/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
@@ -10,7 +10,7 @@ Darkswarm.controller "OrderCycleCtrl", ($scope, $timeout, OrderCycle) ->
       $("#order_cycle_id").trigger("openTrigger")
 
 
-Darkswarm.controller "OrderCycleChangeCtrl", ($scope, $timeout, OrderCycle, Products, Variants, Cart) ->
+Darkswarm.controller "OrderCycleChangeCtrl", ($scope, $timeout, OrderCycle, Products, Variants, Cart, ChangeableOrdersAlert) ->
   # Track previous order cycle id for use with revertOrderCycle()
   $scope.previous_order_cycle_id = OrderCycle.order_cycle.order_cycle_id
   $scope.$watch 'order_cycle.order_cycle_id', (newValue, oldValue)->
@@ -31,3 +31,4 @@ Darkswarm.controller "OrderCycleChangeCtrl", ($scope, $timeout, OrderCycle, Prod
     Cart.clear()
     Products.update()
     Cart.reloadFinalisedLineItems()
+    ChangeableOrdersAlert.reload()
diff --git a/app/assets/javascripts/darkswarm/directives/changeable_order_alert.js.coffee b/app/assets/javascripts/darkswarm/directives/changeable_order_alert.js.coffee
new file mode 100644
index 0000000000..7fec779ce1
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/directives/changeable_order_alert.js.coffee
@@ -0,0 +1,5 @@
+Darkswarm.directive "changeableOrdersAlert", (ChangeableOrdersAlert) ->
+  restrict: "C"
+  scope: true
+  link: (scope, element, attrs) ->
+    scope.alert = ChangeableOrdersAlert
diff --git a/app/assets/javascripts/darkswarm/services/changeable_orders_alert.js.coffee b/app/assets/javascripts/darkswarm/services/changeable_orders_alert.js.coffee
new file mode 100644
index 0000000000..e4b597c57b
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/services/changeable_orders_alert.js.coffee
@@ -0,0 +1,14 @@
+Darkswarm.factory 'ChangeableOrdersAlert', ($http) ->
+  new class ChangeableOrdersAlert
+    html: ''
+    visible: true
+
+    constructor: ->
+      @reload()
+
+    reload: ->
+      $http.get('/shop/changeable_orders_alert').then (response) =>
+        @html = response.data.trim()
+
+    close: =>
+      @visible = false
diff --git a/app/assets/stylesheets/darkswarm/shop.css.scss b/app/assets/stylesheets/darkswarm/shop.css.scss
index 33ccbb31e7..eb738fd6ba 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.scss
+++ b/app/assets/stylesheets/darkswarm/shop.css.scss
@@ -110,6 +110,10 @@
     }
   }
 
+  .alert-box.changeable-orders-alert {
+    margin-bottom: 0px;
+  }
+
   .alert-box.shopfront-message {
     border: 2px solid $clr-turquoise;
     border-radius: 5px;
diff --git a/app/controllers/shop_controller.rb b/app/controllers/shop_controller.rb
index 091a501ca5..6ad6f56e56 100644
--- a/app/controllers/shop_controller.rb
+++ b/app/controllers/shop_controller.rb
@@ -37,6 +37,10 @@ class ShopController < BaseController
     end
   end
 
+  def changeable_orders_alert
+    render layout: false
+  end
+
   private
 
   def filtered_json(products_json)
diff --git a/app/helpers/spree/orders_helper.rb b/app/helpers/spree/orders_helper.rb
index 05644815b7..99540f6ed4 100644
--- a/app/helpers/spree/orders_helper.rb
+++ b/app/helpers/spree/orders_helper.rb
@@ -19,9 +19,10 @@ module Spree
 
     def changeable_orders
       # Only returns open order for the current user + shop + oc combo
-      return [] unless spree_current_user && current_distributor && current_order_cycle
-      return [] unless current_distributor.allow_order_changes?
-      Spree::Order.complete.where(
+      return @changeable_orders unless @changeable_orders.nil?
+      return @changeable_orders = [] unless spree_current_user && current_distributor && current_order_cycle
+      return @changeable_orders = [] unless current_distributor.allow_order_changes?
+      @changeable_orders = Spree::Order.complete.where(
         state: 'complete',
         user_id: spree_current_user.id,
         distributor_id: current_distributor.id,
@@ -33,6 +34,7 @@ module Spree
     end
 
     def shop_changeable_orders_alert_html
+      return "" unless changeable_orders.any?
       t(:shop_changeable_orders_alert_html,
         count: changeable_orders.count,
         path: changeable_orders_link_path,
diff --git a/app/views/enterprises/shop.html.haml b/app/views/enterprises/shop.html.haml
index 23c31e69aa..2dd7b63b09 100644
--- a/app/views/enterprises/shop.html.haml
+++ b/app/views/enterprises/shop.html.haml
@@ -8,10 +8,9 @@
 = inject_shop_enterprises
 
 %shop.darkswarm
-  - if changeable_orders.any?
-    .alert-box.info{ "ofn-inline-alert" => true, ng: { show: "visible" } }
-      = shop_changeable_orders_alert_html
-      %a.close{ ng: { click: "close()" } } &times;
+  .alert-box.changeable-orders-alert.info.animate-show{ ng: { show: "alert.visible && alert.html" } }
+    %span{ ng: { bind: { html: "alert.html" } } }
+    %a.close{ ng: { click: "alert.close()" } } &times;
 
   - content_for :order_cycle_form do
 
diff --git a/app/views/shop/changeable_orders_alert.html.haml b/app/views/shop/changeable_orders_alert.html.haml
new file mode 100644
index 0000000000..2fc8f1b551
--- /dev/null
+++ b/app/views/shop/changeable_orders_alert.html.haml
@@ -0,0 +1 @@
+= shop_changeable_orders_alert_html
diff --git a/config/routes.rb b/config/routes.rb
index a38fb8a55c..ca5a8d5ade 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -28,6 +28,7 @@ Openfoodnetwork::Application.routes.draw do
     get :products
     post :order_cycle
     get :order_cycle
+    get :changeable_orders_alert
   end
 
   resources :producers, only: [:index] do