diff --git a/app/views/spree/users/_past_orders.html.haml b/app/views/spree/users/_past_orders.html.haml
index 903baf853c..434cdef3b8 100644
--- a/app/views/spree/users/_past_orders.html.haml
+++ b/app/views/spree/users/_past_orders.html.haml
@@ -8,7 +8,7 @@
         %th.order4.show-for-large-up= t('.items')
         %th.order5.text-right= t('.total')
         %th.order6.text-right.show-for-large-up= t('.paid?')
-        %th.order7.text-right= t('.view')
+        %th.order7.text-right= t('.status')
       %tbody.transaction-group{"ng-repeat" => "order in Orders.all | filter:{changes_allowed:false} as pastOrders", "ng-class-odd"=>"'odd'", "ng-class-even"=>"'even'"}
         %tr.order-row
           %td.order1{"ng-bind" => "::order.number"}
@@ -18,5 +18,6 @@
           %td.order4.show-for-large-up{"ng-bind" => "::order.item_count"}
           %td.order5.text-right{"ng-class" => "{'debit': order.payment_state != 'paid', 'credit': order.payment_state == 'paid'}","ng-bind" => "::order.total | localizeCurrency"}
           %td.order6.text-right.show-for-large-up{"ng-class" => "{'debit': order.payment_state != 'paid', 'credit': order.payment_state == 'paid'}", "ng-bind" => "::(order.payment_state == 'paid' ? 'say_yes' : 'say_no') | t"}
-          %td.order7.text-right
-            %a{"ng-href" => "{{::order.path}}" }= t('.view')
+            %td.order7.text-right{ "ng-switch" => "::order.state"  }
+              %a{ "ng-switch-when" => "complete", "ng-href" => "{{::order.path}}" }= t('.completed')
+              %span{ "ng-switch-when" => "canceled" }= t('.cancelled')
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d7a2282288..44ab05295d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -4208,7 +4208,9 @@ See the %{link} to find out more about %{sitename}'s features and to start using
         items: Items
         total: Total
         paid?: Paid?
-        view: View
+        status: Status
+        completed: Completed
+        cancelled: Cancelled
       saved_cards:
         default?: Default?
         delete?: Delete?