diff --git a/app/assets/javascripts/supplier/app/components/button/mark-order-cancelled.js.coffee b/app/assets/javascripts/supplier/app/components/button/mark-order-cancelled.js.coffee
index e4633dd6..a05e51b5 100644
--- a/app/assets/javascripts/supplier/app/components/button/mark-order-cancelled.js.coffee
+++ b/app/assets/javascripts/supplier/app/components/button/mark-order-cancelled.js.coffee
@@ -6,5 +6,8 @@ App.ButtonMarkOrderCancelledComponent = Ember.Component.extend
   showButton: Ember.computed 'order.state', ->
     state = @get('order.state')
     state is 'placed' or state is 'active'
-  click: -> @get('order').mark_cancelled()
+  click: ->
+    @modal 'confirm',
+      model: @get('order')
+      ok: => @get('order').mark_cancelled()
 
diff --git a/app/assets/javascripts/supplier/app/controllers/modals/confirm.js.coffee b/app/assets/javascripts/supplier/app/controllers/modals/confirm.js.coffee
new file mode 100644
index 00000000..5afd0c16
--- /dev/null
+++ b/app/assets/javascripts/supplier/app/controllers/modals/confirm.js.coffee
@@ -0,0 +1,2 @@
+App.modals.ConfirmController = App.modals.BaseController.extend
+  title_path: 'confirm.title'
diff --git a/app/assets/javascripts/waiter/app/templates/table.emblem b/app/assets/javascripts/waiter/app/templates/table.emblem
index 31a79779..5dd10bbe 100644
--- a/app/assets/javascripts/waiter/app/templates/table.emblem
+++ b/app/assets/javascripts/waiter/app/templates/table.emblem
@@ -7,7 +7,7 @@ h4
   = number
 .panel
   ul.product-orders
-    each product_order in product_orders
+    each product_orders as |product_order|
       li
         = product_order.quantity
         |  x
diff --git a/config/locales/supplier.en.yml b/config/locales/supplier.en.yml
index c07331db..2cc22df3 100644
--- a/config/locales/supplier.en.yml
+++ b/config/locales/supplier.en.yml
@@ -3,6 +3,7 @@ en:
     page:
       cannot_compile: There is an error in the page that prevented it from being displayed.
     confirm:
+      title: Are you sure?
       cancel: "Cancel"
       confirm: "OK"
     general:
diff --git a/config/locales/supplier.nl.yml b/config/locales/supplier.nl.yml
index 52ee78cd..d1d923be 100644
--- a/config/locales/supplier.nl.yml
+++ b/config/locales/supplier.nl.yml
@@ -3,6 +3,7 @@ nl:
     page:
       cannot_compile: There is an error in the page that prevented it from being displayed.
     confirm:
+      title: Weet je dit zeker?
       cancel: Cancel
       confirm: Ja
     general:
@@ -33,7 +34,7 @@ nl:
       price: Prijs
     supplier:
       close_for_orders: De zaak afsluiten voor bestellingen
-      close_for_orders_confirmation: If you close the shop, you cannot receive orders! Are you sure?
+      close_for_orders_confirmation: Als je de zaak afsluit kan je geen ${models.plural.order|downcase} meer ontvangen. Weet je dit zeker?
       open_for_orders: 'Open de zaak!'
       you_are_currently_closed_alert: 'Je bent momenteel gesloten en kan geen orders ontvangen'
       settings: Instellingen